diff --git a/README.md b/README.md
index 268e29233..b0b0dad48 100644
--- a/README.md
+++ b/README.md
@@ -12,8 +12,7 @@ You're going to love Zammad!
 
 ## Installing & Getting Started
 
-https://zammad.org/documentation
-
+http://zammad.readthedocs.io
 
 ## Screenshots
 
@@ -22,7 +21,7 @@ https://zammad.org/screenshots
 
 ## REST API
 
-https://zammad.org/documentation/api/intro
+http://zammad.readthedocs.io/en/latest/api-intro.html
 
 
 ## Contributing
diff --git a/contrib/nginx/elasticsearch.conf b/contrib/nginx/elasticsearch.conf
new file mode 100644
index 000000000..6305728b9
--- /dev/null
+++ b/contrib/nginx/elasticsearch.conf
@@ -0,0 +1,20 @@
+#
+# this is the nginx config for elasticsearch with authentication for remote login
+# you need to create the auth file /etc/nginx/.htpasswd-elasticsearch with you username and password
+# this can be done on the shell via: 'htpasswd -b -c /etc/nginx/.htpasswd-elasticsearch USERNAME PASSWORD'
+#
+
+upstream elasticsearch {
+    server 127.0.0.1:9200;
+}
+
+server {
+    listen 9200;
+
+    auth_basic "Elasticsearch";
+    auth_basic_user_file /etc/nginx/.htpasswd-elasticsearch;
+
+    location / {
+        proxy_pass http://elasticsearch;
+    }
+}
diff --git a/contrib/nginx/zammad.conf b/contrib/nginx/zammad.conf
index 82996d597..3dfc6d19e 100644
--- a/contrib/nginx/zammad.conf
+++ b/contrib/nginx/zammad.conf
@@ -12,9 +12,10 @@ upstream zammad-websocket {
 
 server {
     listen 80;
-    
+
+    # replace 'localhost' with your fqdn if you want to use zammad frome remote
     server_name localhost;
-    
+
     root /opt/zammad/public;
 
     access_log /var/log/nginx/zammad.access.log;