diff --git a/Makefile b/Makefile
index 92e780611..9b1bd942d 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ install.opt: install.META.opt install.files
 # BB If install is not run by root but OCSIGENUSER, OCSIGENGROUP is somebody
 # BB different, make files universally accessible, we cannot chown.
 INSTALL_CAN_PUT_PERMISSIONS=yes
-INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g $(OCSIGENGROUP)
+INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g "$(OCSIGENGROUP)"
 INSTALL_MOD_660=660
 INSTALL_MOD_644=644
 INSTALL_MOD_755=755
@@ -99,7 +99,7 @@ install.files:
 	[ -p $(TEMPROOT)$(COMMANDPIPE) ] || \
 	 { mkfifo -m ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \
 	   if [ "${INSTALL_CAN_PUT_PERMISSIONS}" = yes ]; \
-	     then $(CHOWN) -R $(OCSIGENUSER):$(OCSIGENGROUP) $(TEMPROOT)$(COMMANDPIPE); \
+	     then $(CHOWN) -R $(OCSIGENUSER):"$(OCSIGENGROUP)" $(TEMPROOT)$(COMMANDPIPE); \
 	   fi; }
 	 ## Configuration files
 	$(INSTALL) -m ${INSTALL_MOD_755} -d $(TEMPROOT)$(CONFIGDIR)/conf.d
@@ -162,7 +162,7 @@ logrotate:
 	 cat src/files/logrotate.in \
 	     | sed s%LOGDIR%$(LOGDIR)%g \
 	     | sed s%USER%$(OCSIGENUSER)%g \
-	     | sed s%GROUP%$(OCSIGENGROUP)%g \
+	     | sed s%GROUP%"$(OCSIGENGROUP)"%g \
 	     | sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
 	     > $(TEMPROOT)/etc/logrotate.d/$(PROJECTNAME)
 
diff --git a/src/Makefile b/src/Makefile
index b89fd03a8..eadc5ae0c 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -51,7 +51,7 @@ confs: ../$(PROJECTNAME).conf.sample ../local/etc/${PROJECTNAME}.conf
 	  | sed s%_LOGDIR_%$(LOGDIR)%g \
 	  | sed s%_DATADIR_%$(DATADIR)%g \
 	  | sed s%_OCSIGENUSER_%$(OCSIGENUSER)%g \
-	  | sed s%_OCSIGENGROUP_%$(OCSIGENGROUP)%g \
+	  | sed s%_OCSIGENGROUP_%"$(OCSIGENGROUP)"%g \
 	  | sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
 	  | sed s%_MIMEFILE_%$(CONFIGDIR)/mime.types%g \
 	  | sed s%_METADIR_%$(LIBDIR)%g \
diff --git a/src/baselib/Makefile b/src/baselib/Makefile
index 6b99d60b7..57f06929b 100644
--- a/src/baselib/Makefile
+++ b/src/baselib/Makefile
@@ -73,7 +73,7 @@ ocsigen_config.ml: ocsigen_config.ml.in ../../Makefile.config ../../Makefile.opt
 	| sed s%_STATICPAGESDIR_%$(STATICPAGESDIR)% \
 	| sed s%_UP_%$(UPLOADDIR)%g \
 	| sed s%_OCSIGENUSER_%$(OCSIGENUSER)%g \
-	| sed s%_OCSIGENGROUP_%$(OCSIGENGROUP)%g \
+	| sed s%_OCSIGENGROUP_%"$(OCSIGENGROUP)"%g \
 	| sed s%_PROJECTNAME_%$(PROJECTNAME)%g \
 	| sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
 	| sed s%_CONFIGDIR_%$(CONFIGDIR)% \