diff --git a/contrib/nginx-zammad.conf b/contrib/nginx-zammad.conf
new file mode 100644
index 000000000..26da690b0
--- /dev/null
+++ b/contrib/nginx-zammad.conf
@@ -0,0 +1,31 @@
+#
+# this is the nginx config for zammad
+# link this file in your /etc/nginx/sites-enabled via symlink 
+# (ln -s /opt/zammad/contrib/nginx-zammad.conf /etc/nginx/sites-enabled/zammad.conf)
+#
+
+server {
+    listen 80;
+    server_name your.domain.org;
+    root /opt/zammad/public;
+
+    access_log /var/log/nginx/zammad.access.log;
+    error_log  /var/log/nginx/zammad.error.log;
+
+    location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) {
+        expires max;
+    }
+
+    location /ws {
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_pass http://localhost:6042;
+    }
+
+    location / {
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+	proxy_pass http://localhost:3000;
+    }
+}
diff --git a/contrib/nginx/sites-enabled/zammad.conf b/contrib/nginx/sites-enabled/zammad.conf
index cdf27e10e..5be122287 100644
--- a/contrib/nginx/sites-enabled/zammad.conf
+++ b/contrib/nginx/sites-enabled/zammad.conf
@@ -1,26 +1,30 @@
+#
+# this is the nginx config for zammad
+# link this file in your sites-enabled via symlink (ln -s nginx-zammad.conf /etc/nginx/sites-enabled/zammad.conf)
+#
 
 server {
-  listen 80;
-  server_name localhost;
-  root /path_/to_/zammad;
+	listen 80;
+	server_name your.domain.org;
+	root /opt/zammad/public;
 
-  location /ws {
-    proxy_pass http://localhost:6042;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "Upgrade";
-    proxy_read_timeout 86400;
-  }
+	access_log /var/log/nginx/zammad.access.log;
+	error_log  /var/log/nginx/zammad.error.log;
 
-  location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) {
-          root /path_/to_/zammad/public;
-          access_log off;
-          expires max;
-    }
+	location ~ ^/(assets/|robots.txt|humans.txt|favicon.ico) {
+		expires max;
+	}
 
-  location / {
-    proxy_pass http://localhost:9292;
-    proxy_set_header Host $host;
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-  }
+	location /ws {
+		proxy_http_version 1.1;
+		proxy_set_header Upgrade $http_upgrade;
+		proxy_set_header Connection "Upgrade";
+		proxy_pass http://localhost:6042;
+	}
+
+	location / {
+		proxy_set_header Host $host;
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_pass http://localhost:3000;
+	}
 }