X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/eb615347d28738cdf553112afe5623c7d7ae9344..b0ef84caae79f7478b749b1b4af15ee838ca412c:/README.md

diff --git a/README.md b/README.md
index dd900e3e..7a75fe93 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/openstreetmap/Nominatim.svg?branch=master)](https://travis-ci.org/openstreetmap/Nominatim)
+[![Build Status](https://travis-ci.org/osm-search/Nominatim.svg?branch=master)](https://travis-ci.org/osm-search/Nominatim)
 
 Nominatim
 =========
@@ -19,8 +19,16 @@ https://nominatim.org/release-docs/develop/ .
 Installation
 ============
 
+**Nominatim is a complex piece of software and runs in a complex environment.
+Installing and running Nominatim is something for experienced system
+administrators only who can do some trouble-shooting themselves. We are sorry,
+but we can not provide installation support. We are all doing this in our free
+time and there is just so much of that time to go around. Do not open issues in
+our bug tracker if you need help. You can ask questions on the mailing list
+(see below) or on [help.openstreetmap.org](https://help.openstreetmap.org/).**
+
 The latest stable release can be downloaded from https://nominatim.org.
-There you can also find [installation instructions for the release](https://nominatim.org/release-docs/latest/admin/Installation).
+There you can also find [installation instructions for the release](https://nominatim.org/release-docs/latest/admin/Installation), as well as an extensive [Troubleshooting/FAQ section](https://nominatim.org/release-docs/latest/admin/Faq/).
 
 Detailed installation instructions for the development version can be
 found at [nominatim.org](https://nominatim.org/release-docs/develop/admin/Installation)
@@ -51,7 +59,7 @@ The source code is available under a GPLv2 license.
 Contributing
 ============
 
-Contributions are welcome. For details see [CONTRIBUTING.md](contribution guide).
+Contributions are welcome. For details see [contribution guide](CONTRIBUTING.md).
 
 Both bug reports and pull requests are welcome.
 
@@ -59,5 +67,5 @@ Both bug reports and pull requests are welcome.
 Mailing list
 ============
 
-For questions you can join the geocoding mailinglist, see
+For questions you can join the geocoding mailing list, see
 https://lists.openstreetmap.org/listinfo/geocoding