diff --git a/Makefile b/Makefile
index ba7cb3142..5e4fd910f 100644
--- a/Makefile
+++ b/Makefile
@@ -50,14 +50,14 @@ DATADIR=$(LMPREFIX)/data
 # Document roots for Apache VirtualHosts
 DOCUMENTROOT=$(LMPREFIX)/htdocs
 PORTALDIR=$(DOCUMENTROOT)/portal
-PORTALSITEDIR=$(PORTALDIR)
-PORTALSTATICDIR=$(PORTALSITEDIR)/htdocs/static
+PORTALSITEDIR=$(PORTALDIR)/htdocs
+PORTALSTATICDIR=$(PORTALSITEDIR)/static
 PORTALRELATIVESTATICDIR=/static
-PORTALTEMPLATESDIR=$(PORTALSITEDIR)/templates
+PORTALTEMPLATESDIR=$(PORTALDIR)/templates
 
 MANAGERDIR=$(DOCUMENTROOT)/manager
-MANAGERSITEDIR=$(MANAGERDIR)
-MANAGERSTATICDIR=$(MANAGERSITEDIR)/htdocs/static
+MANAGERSITEDIR=$(MANAGERDIR)/htdocs
+MANAGERSTATICDIR=$(MANAGERSITEDIR)/static
 MANAGERRELATIVESTATICDIR=/static
 MANAGERTEMPLATESDIR=$(MANAGERSITEDIR)/templates
 DOCDIR=$(DOCUMENTROOT)
@@ -626,7 +626,7 @@ install_manager_site:	install_conf_dir
 	# Manager install
 	@install -v -d $(RMANAGERDIR) $(RMANAGERSTATICDIR) \
 		$(RMANAGERTEMPLATESDIR)
-	@cp -pR -f $(SRCMANAGERDIR)/site/htdocs/manager.* $(RMANAGERDIR)
+	@cp -pR -f $(SRCMANAGERDIR)/site/htdocs/manager.* $(RMANAGERSITEDIR)
 	@cp -pR $(SRCMANAGERDIR)/site/htdocs/static/* $(RMANAGERSTATICDIR)
 	@for f in $(SRCMANAGERDIR)/site/templates/*.tpl; do \
 		./scripts/transform-templates \
@@ -652,7 +652,7 @@ install_portal_site:	install_conf_dir
 	@install -v -d $(RPORTALDIR) $(RPORTALSTATICDIR) \
 		$(RPORTALTEMPLATESDIR) \
 		$(RCRONDIR) $(RCONFDIR)
-	@cp -pR -f $(SRCPORTALDIR)/site/htdocs/index.* $(RPORTALDIR)
+	@cp -pR -f $(SRCPORTALDIR)/site/htdocs/index.* $(RPORTALSITEDIR)
 	@cp -pR -f $(SRCPORTALDIR)/site/htdocs/static/* $(RPORTALSTATICDIR)
 	cd $(SRCPORTALDIR)/site/templates; for f in `find * -type f -name '*.tpl'`; do \
 		echo "$$f => $(RPORTALTEMPLATESDIR)/$$f"; \
diff --git a/_example/etc/manager-apache2.4.conf b/_example/etc/manager-apache2.4.conf
index f0d4375b3..2a675ec65 100644
--- a/_example/etc/manager-apache2.4.conf
+++ b/_example/etc/manager-apache2.4.conf
@@ -46,12 +46,12 @@
     </Files>
 
     # If you want to use mod_fastcgi, replace lines below by:
-    #FastCgiServer __MANAGERDIR__/manager.fcgi
+    #FastCgiServer __MANAGERSITEDIR__/manager.fcgi
 
     # GLOBAL CONFIGURATION
     # --------------------
 
-    DocumentRoot __MANAGERDIR__
+    DocumentRoot __MANAGERSITEDIR__
 
     <Location />
         Require all granted
diff --git a/_example/etc/manager-apache2.X.conf b/_example/etc/manager-apache2.X.conf
index 5d1b6ea08..21ecd600d 100644
--- a/_example/etc/manager-apache2.X.conf
+++ b/_example/etc/manager-apache2.X.conf
@@ -46,12 +46,12 @@
     </Files>
 
     # If you want to use mod_fastcgi, replace lines below by:
-    #FastCgiServer __MANAGERDIR__/manager.fcgi
+    #FastCgiServer __MANAGERSITEDIR__/manager.fcgi
 
     # GLOBAL CONFIGURATION
     # --------------------
 
-    DocumentRoot __MANAGERDIR__
+    DocumentRoot __MANAGERSITEDIR__
 
     <Location />
         <IfVersion >= 2.3>
diff --git a/_example/etc/manager-apache2.conf b/_example/etc/manager-apache2.conf
index dd3e7b988..686a08500 100644
--- a/_example/etc/manager-apache2.conf
+++ b/_example/etc/manager-apache2.conf
@@ -46,12 +46,12 @@
     </Files>
 
     # If you want to use mod_fastcgi, replace lines below by:
-    #FastCgiServer __MANAGERDIR__/manager.fcgi
+    #FastCgiServer __MANAGERSITEDIR__/manager.fcgi
 
     # GLOBAL CONFIGURATION
     # --------------------
 
-    DocumentRoot __MANAGERDIR__
+    DocumentRoot __MANAGERSITEDIR__
 
     <Location />
         Order Deny,Allow
diff --git a/_example/etc/manager-nginx.conf b/_example/etc/manager-nginx.conf
index 0df4ab120..2f2bad88a 100644
--- a/_example/etc/manager-nginx.conf
+++ b/_example/etc/manager-nginx.conf
@@ -1,7 +1,7 @@
 server {
   listen __PORT__;
   server_name manager.__DNSDOMAIN__;
-  root __MANAGERDIR__;
+  root __MANAGERSITEDIR__;
 
   if ($uri !~ ^/(.*\.psgi|static|doc|fr-doc|lib|javascript|favicon)) {
     rewrite ^/(.*)$ /manager.psgi/$1 break;
diff --git a/_example/etc/portal-apache2.4.conf b/_example/etc/portal-apache2.4.conf
index dd5e35d32..b49af06fd 100644
--- a/_example/etc/portal-apache2.4.conf
+++ b/_example/etc/portal-apache2.4.conf
@@ -10,8 +10,8 @@
     ServerName auth.__DNSDOMAIN__
 
     # DocumentRoot (FCGI scripts)
-    DocumentRoot __PORTALDIR__
-    <Directory __PORTALDIR__>
+    DocumentRoot __PORTALSITEDIR__
+    <Directory __PORTALSITEDIR__>
         Require all granted
         Options +ExecCGI +FollowSymLinks
     </Directory>
diff --git a/_example/etc/portal-apache2.X.conf b/_example/etc/portal-apache2.X.conf
index 8131cb915..a13a632f9 100644
--- a/_example/etc/portal-apache2.X.conf
+++ b/_example/etc/portal-apache2.X.conf
@@ -10,8 +10,8 @@
     ServerName auth.__DNSDOMAIN__
 
     # DocumentRoot (FCGI scripts)
-    DocumentRoot __PORTALDIR__
-    <Directory __PORTALDIR__>
+    DocumentRoot __PORTALSITEDIR__
+    <Directory __PORTALSITEDIR__>
         <IfVersion >= 2.3>
             Require all granted
         </IfVersion>
diff --git a/_example/etc/portal-apache2.conf b/_example/etc/portal-apache2.conf
index 36a70f3cb..900058680 100644
--- a/_example/etc/portal-apache2.conf
+++ b/_example/etc/portal-apache2.conf
@@ -10,8 +10,8 @@
     ServerName auth.__DNSDOMAIN__
 
     # DocumentRoot (FCGI scripts)
-    DocumentRoot __PORTALDIR__
-    <Directory __PORTALDIR__>
+    DocumentRoot __PORTALSITEDIR__
+    <Directory __PORTALSITEDIR__>
         Order allow,deny
         Allow from all
         Options +ExecCGI +FollowSymLinks
diff --git a/_example/etc/portal-nginx.conf b/_example/etc/portal-nginx.conf
index f8ca80591..d400886db 100644
--- a/_example/etc/portal-nginx.conf
+++ b/_example/etc/portal-nginx.conf
@@ -1,7 +1,7 @@
 server {
   listen __PORT__;
   server_name auth.__DNSDOMAIN__;
-  root __PORTALDIR__;
+  root __PORTALSITEDIR__;
 
   if ($uri !~ ^/((static|javascript|favicon).*|.*\.psgi)) {
     rewrite ^/(.*)$ /index.psgi/$1 break;