diff --git a/install/debian/7/nginx/phpmyadmin.inc b/install/debian/7/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/debian/7/nginx/phpmyadmin.inc
+++ b/install/debian/7/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/debian/7/nginx/phppgadmin.inc b/install/debian/7/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/debian/7/nginx/phppgadmin.inc
+++ b/install/debian/7/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/debian/7/nginx/webmail.inc b/install/debian/7/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/debian/7/nginx/webmail.inc
+++ b/install/debian/7/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/debian/8/nginx/phpmyadmin.inc b/install/debian/8/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/debian/8/nginx/phpmyadmin.inc
+++ b/install/debian/8/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/debian/8/nginx/phppgadmin.inc b/install/debian/8/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/debian/8/nginx/phppgadmin.inc
+++ b/install/debian/8/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/debian/8/nginx/webmail.inc b/install/debian/8/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/debian/8/nginx/webmail.inc
+++ b/install/debian/8/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/debian/9/nginx/phpmyadmin.inc b/install/debian/9/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/debian/9/nginx/phpmyadmin.inc
+++ b/install/debian/9/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/debian/9/nginx/phppgadmin.inc b/install/debian/9/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/debian/9/nginx/phppgadmin.inc
+++ b/install/debian/9/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/debian/9/nginx/webmail.inc b/install/debian/9/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/debian/9/nginx/webmail.inc
+++ b/install/debian/9/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/rhel/5/nginx/phpmyadmin.inc b/install/rhel/5/nginx/phpmyadmin.inc
index efd6f4c41..ee0030072 100644
--- a/install/rhel/5/nginx/phpmyadmin.inc
+++ b/install/rhel/5/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpMyAdmin/;
+    alias /usr/share/phpMyAdmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/rhel/5/nginx/phppgadmin.inc b/install/rhel/5/nginx/phppgadmin.inc
index 333e560a2..61dea1c9c 100644
--- a/install/rhel/5/nginx/phppgadmin.inc
+++ b/install/rhel/5/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phpPgAdmin/;
+    alias /usr/share/phpPgAdmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phpPgAdmin/$1;
diff --git a/install/rhel/5/nginx/webmail.inc b/install/rhel/5/nginx/webmail.inc
index 2d0fbe293..d9cc181dc 100644
--- a/install/rhel/5/nginx/webmail.inc
+++ b/install/rhel/5/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /usr/share/roundcubemail/;
+    alias /usr/share/roundcubemail;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/rhel/6/nginx/phpmyadmin.inc b/install/rhel/6/nginx/phpmyadmin.inc
index 9c5a68825..122823d70 100644
--- a/install/rhel/6/nginx/phpmyadmin.inc
+++ b/install/rhel/6/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpMyAdmin/;
+    alias /usr/share/phpMyAdmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/rhel/6/nginx/phppgadmin.inc b/install/rhel/6/nginx/phppgadmin.inc
index 333e560a2..61dea1c9c 100644
--- a/install/rhel/6/nginx/phppgadmin.inc
+++ b/install/rhel/6/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phpPgAdmin/;
+    alias /usr/share/phpPgAdmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phpPgAdmin/$1;
diff --git a/install/rhel/6/nginx/webmail.inc b/install/rhel/6/nginx/webmail.inc
index 2d0fbe293..d9cc181dc 100644
--- a/install/rhel/6/nginx/webmail.inc
+++ b/install/rhel/6/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /usr/share/roundcubemail/;
+    alias /usr/share/roundcubemail;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/rhel/7/nginx/phpmyadmin.inc b/install/rhel/7/nginx/phpmyadmin.inc
index 457ee11c2..79e17c58f 100644
--- a/install/rhel/7/nginx/phpmyadmin.inc
+++ b/install/rhel/7/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpMyAdmin/;
+    alias /usr/share/phpMyAdmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/rhel/7/nginx/phppgadmin.inc b/install/rhel/7/nginx/phppgadmin.inc
index 333e560a2..61dea1c9c 100644
--- a/install/rhel/7/nginx/phppgadmin.inc
+++ b/install/rhel/7/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phpPgAdmin/;
+    alias /usr/share/phpPgAdmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phpPgAdmin/$1;
diff --git a/install/rhel/7/nginx/webmail.inc b/install/rhel/7/nginx/webmail.inc
index 123e4af5c..63679d35d 100644
--- a/install/rhel/7/nginx/webmail.inc
+++ b/install/rhel/7/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /usr/share/roundcubemail/;
+    alias /usr/share/roundcubemail;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/12.04/nginx/phpmyadmin.inc b/install/ubuntu/12.04/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/12.04/nginx/phpmyadmin.inc
+++ b/install/ubuntu/12.04/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/12.04/nginx/phppgadmin.inc b/install/ubuntu/12.04/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/12.04/nginx/phppgadmin.inc
+++ b/install/ubuntu/12.04/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/12.04/nginx/webmail.inc b/install/ubuntu/12.04/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/12.04/nginx/webmail.inc
+++ b/install/ubuntu/12.04/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/12.10/nginx/phpmyadmin.inc b/install/ubuntu/12.10/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/12.10/nginx/phpmyadmin.inc
+++ b/install/ubuntu/12.10/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/12.10/nginx/phppgadmin.inc b/install/ubuntu/12.10/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/12.10/nginx/phppgadmin.inc
+++ b/install/ubuntu/12.10/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/12.10/nginx/webmail.inc b/install/ubuntu/12.10/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/12.10/nginx/webmail.inc
+++ b/install/ubuntu/12.10/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/13.04/nginx/phpmyadmin.inc b/install/ubuntu/13.04/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/13.04/nginx/phpmyadmin.inc
+++ b/install/ubuntu/13.04/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/13.04/nginx/phppgadmin.inc b/install/ubuntu/13.04/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/13.04/nginx/phppgadmin.inc
+++ b/install/ubuntu/13.04/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/13.04/nginx/webmail.inc b/install/ubuntu/13.04/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/13.04/nginx/webmail.inc
+++ b/install/ubuntu/13.04/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/13.10/nginx/phpmyadmin.inc b/install/ubuntu/13.10/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/13.10/nginx/phpmyadmin.inc
+++ b/install/ubuntu/13.10/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/13.10/nginx/phppgadmin.inc b/install/ubuntu/13.10/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/13.10/nginx/phppgadmin.inc
+++ b/install/ubuntu/13.10/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/13.10/nginx/webmail.inc b/install/ubuntu/13.10/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/13.10/nginx/webmail.inc
+++ b/install/ubuntu/13.10/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/14.04/nginx/phpmyadmin.inc b/install/ubuntu/14.04/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/14.04/nginx/phpmyadmin.inc
+++ b/install/ubuntu/14.04/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/14.04/nginx/phppgadmin.inc b/install/ubuntu/14.04/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/14.04/nginx/phppgadmin.inc
+++ b/install/ubuntu/14.04/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/14.04/nginx/webmail.inc b/install/ubuntu/14.04/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/14.04/nginx/webmail.inc
+++ b/install/ubuntu/14.04/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/14.10/nginx/phpmyadmin.inc b/install/ubuntu/14.10/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/14.10/nginx/phpmyadmin.inc
+++ b/install/ubuntu/14.10/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/14.10/nginx/phppgadmin.inc b/install/ubuntu/14.10/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/14.10/nginx/phppgadmin.inc
+++ b/install/ubuntu/14.10/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/14.10/nginx/webmail.inc b/install/ubuntu/14.10/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/14.10/nginx/webmail.inc
+++ b/install/ubuntu/14.10/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/15.04/nginx/phpmyadmin.inc b/install/ubuntu/15.04/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/15.04/nginx/phpmyadmin.inc
+++ b/install/ubuntu/15.04/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/15.04/nginx/phppgadmin.inc b/install/ubuntu/15.04/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/15.04/nginx/phppgadmin.inc
+++ b/install/ubuntu/15.04/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/15.04/nginx/webmail.inc b/install/ubuntu/15.04/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/15.04/nginx/webmail.inc
+++ b/install/ubuntu/15.04/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/15.10/nginx/phpmyadmin.inc b/install/ubuntu/15.10/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/15.10/nginx/phpmyadmin.inc
+++ b/install/ubuntu/15.10/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/15.10/nginx/phppgadmin.inc b/install/ubuntu/15.10/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/15.10/nginx/phppgadmin.inc
+++ b/install/ubuntu/15.10/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/15.10/nginx/webmail.inc b/install/ubuntu/15.10/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/15.10/nginx/webmail.inc
+++ b/install/ubuntu/15.10/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/16.04/nginx/phpmyadmin.inc b/install/ubuntu/16.04/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/16.04/nginx/phpmyadmin.inc
+++ b/install/ubuntu/16.04/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/16.04/nginx/phppgadmin.inc b/install/ubuntu/16.04/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/16.04/nginx/phppgadmin.inc
+++ b/install/ubuntu/16.04/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/16.04/nginx/webmail.inc b/install/ubuntu/16.04/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/16.04/nginx/webmail.inc
+++ b/install/ubuntu/16.04/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/16.10/nginx/phpmyadmin.inc b/install/ubuntu/16.10/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/16.10/nginx/phpmyadmin.inc
+++ b/install/ubuntu/16.10/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/16.10/nginx/phppgadmin.inc b/install/ubuntu/16.10/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/16.10/nginx/phppgadmin.inc
+++ b/install/ubuntu/16.10/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/16.10/nginx/webmail.inc b/install/ubuntu/16.10/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/16.10/nginx/webmail.inc
+++ b/install/ubuntu/16.10/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/17.04/nginx/phpmyadmin.inc b/install/ubuntu/17.04/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/17.04/nginx/phpmyadmin.inc
+++ b/install/ubuntu/17.04/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/17.04/nginx/phppgadmin.inc b/install/ubuntu/17.04/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/17.04/nginx/phppgadmin.inc
+++ b/install/ubuntu/17.04/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/17.04/nginx/webmail.inc b/install/ubuntu/17.04/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/17.04/nginx/webmail.inc
+++ b/install/ubuntu/17.04/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/17.10/nginx/phpmyadmin.inc b/install/ubuntu/17.10/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/17.10/nginx/phpmyadmin.inc
+++ b/install/ubuntu/17.10/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/17.10/nginx/phppgadmin.inc b/install/ubuntu/17.10/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/17.10/nginx/phppgadmin.inc
+++ b/install/ubuntu/17.10/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/17.10/nginx/webmail.inc b/install/ubuntu/17.10/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/17.10/nginx/webmail.inc
+++ b/install/ubuntu/17.10/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/18.04/nginx/phpmyadmin.inc b/install/ubuntu/18.04/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/18.04/nginx/phpmyadmin.inc
+++ b/install/ubuntu/18.04/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/18.04/nginx/phppgadmin.inc b/install/ubuntu/18.04/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/18.04/nginx/phppgadmin.inc
+++ b/install/ubuntu/18.04/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/18.04/nginx/webmail.inc b/install/ubuntu/18.04/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/18.04/nginx/webmail.inc
+++ b/install/ubuntu/18.04/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;
diff --git a/install/ubuntu/18.10/nginx/phpmyadmin.inc b/install/ubuntu/18.10/nginx/phpmyadmin.inc
index 1feb85468..cdfc93c4d 100644
--- a/install/ubuntu/18.10/nginx/phpmyadmin.inc
+++ b/install/ubuntu/18.10/nginx/phpmyadmin.inc
@@ -1,5 +1,5 @@
 location /phpmyadmin {
-    alias /usr/share/phpmyadmin/;
+    alias /usr/share/phpmyadmin;
 
     location ~ /(libraries|setup) {
         return 404;
diff --git a/install/ubuntu/18.10/nginx/phppgadmin.inc b/install/ubuntu/18.10/nginx/phppgadmin.inc
index cd1e5806b..47cfcf4e2 100644
--- a/install/ubuntu/18.10/nginx/phppgadmin.inc
+++ b/install/ubuntu/18.10/nginx/phppgadmin.inc
@@ -1,5 +1,5 @@
 location /phppgadmin {
-    alias /usr/share/phppgadmin/;
+    alias /usr/share/phppgadmin;
 
     location ~ ^/phppgadmin/(.*\.php)$ {
         alias /usr/share/phppgadmin/$1;
diff --git a/install/ubuntu/18.10/nginx/webmail.inc b/install/ubuntu/18.10/nginx/webmail.inc
index ad66895bc..768c90495 100644
--- a/install/ubuntu/18.10/nginx/webmail.inc
+++ b/install/ubuntu/18.10/nginx/webmail.inc
@@ -1,5 +1,5 @@
 location /webmail {
-    alias /var/lib/roundcube/;
+    alias /var/lib/roundcube;
 
     location ~ /(config|temp|logs) {
         return 404;