diff --git a/services/nginx/default.conf b/services/nginx/default.conf
index 935354c..dc915d1 100644
--- a/services/nginx/default.conf
+++ b/services/nginx/default.conf
@@ -4,7 +4,8 @@ server {
     server_name  localhost;
     resolver 127.0.0.11 valid=30s;    
     set $theia theia;
-
+    set $etherpad etherpad;
+    set $dokuwiki dokuwiki;
     #charset koi8-r;
     #access_log  /var/log/nginx/host.access.log  main;
 
@@ -20,10 +21,18 @@ server {
         proxy_set_header Connection "upgrade";
 
     }
+    location /dokuwiki {
+    	rewrite /dokuwiki/(.*) /$1 break;
+	rewrite ^/dokuwiki$ /dokuwiki/ permanent;
+	proxy_pass http://$dokuwiki:8080;
+	proxy_redirect / /dokuwiki/;
+	proxy_set_header Host $host;
+	proxy_buffering off;
+    }
     location /etherpad {
     	rewrite /etherpad/(.*) /$1 break;
 	rewrite ^/etherpad$ /etherpad/ permanent;
-	proxy_pass http://etherpad:9001;
+	proxy_pass http://$etherpad:9001;
 	proxy_redirect / /etherpad/;
 	proxy_set_header Host $host;
 	proxy_buffering off;