diff --git a/conf/nginx.conf b/conf/nginx.conf
index e90050f..cdc2dcf 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,10 +1,15 @@
 location YNH_WWW_PATH {
+
   alias YNH_WWW_ALIAS ;
+
+  # Force https
   if ($scheme = http) {
     rewrite ^ https://$server_name$request_uri? permanent;
   }
+
   index index.php;
   try_files $uri $uri/ index.php;
+
   location ~ [^/]\.php(/|$) {
     fastcgi_split_path_info ^(.+?\.php)(/.*)$;
     fastcgi_pass unix:/var/run/php5-fpm.sock;
@@ -14,6 +19,22 @@ location YNH_WWW_PATH {
     fastcgi_param  PATH_INFO $fastcgi_path_info;
   }
 
+  # Secure DokuWiki
+  location ~ ^/dokuwiki/(data|conf|bin|inc)/ {
+    deny all;
+  }
+
+  # Deny Access to htaccess-Files for Apache
+  location ~ /\.ht {
+    deny all;
+  }
+
+  # Serve static files
+  location ~ ^/lib.*\.(gif|png|ico|jpg)$ {
+    expires 30d;
+  }
+
+
   # Include SSOWAT user panel.
   include conf.d/yunohost_panel.conf.inc;
 }