diff --git a/vbox/Makefile.in b/vbox/Makefile.in
index e93c296d..6eaa1851 100644
--- a/vbox/Makefile.in
+++ b/vbox/Makefile.in
@@ -238,6 +238,7 @@ manuals-d:	  ignore
 		  @cd doc && $(MAKE) distclean
 
 manuals-i:	  ignore
+		  @cd doc && $(MAKE) install
 
 manuals-v:	  ignore
 		  @set -e; for i in `echo $(MANUALS_V)`; do \
@@ -250,19 +251,11 @@ manuals-v:	  ignore
 #                                                                            #
 #----------------------------------------------------------------------------#
 
-SCRIPTS_B	= $(TOPDIR)/utils/vboxmail $(TOPDIR)/utils/vboxplay
-
-SCRIPTS_D	= $(SCRIPTS_B)
-
 scripts-b:	  ignore
-		  @set -e; for i in `echo $(SCRIPTS_B)`; do \
-			$(TOPDIR)/utils/mksed <$$i.in >$$i; \
-		  done
+		  @cd $(TOPDIR)/utils && $(MAKE)
 
 scripts-d:	  ignore
-		  @set -e; for i in `echo $(SCRIPTS_D)`; do \
-			$(RM) -f $$i; \
-		  done
+		  @cd $(TOPDIR)/utils && $(MAKE) distclean
 
 scripts-i:	  ignore
 		  @echo "Installing '$(DESTDIR)$(bindir)/vboxmail'..."
diff --git a/vbox/utils/Makefile.am b/vbox/utils/Makefile.am
index 1a9d75dd..5350784b 100644
--- a/vbox/utils/Makefile.am
+++ b/vbox/utils/Makefile.am
@@ -9,15 +9,15 @@ DISTCLEANFILES=vboxmail vboxplay
 	sed \
 		-e "s#\@MANDATE\@#${MANDATE}#g" \
 		-e "s#\@I4LVERSION\@#@VERSION@#g" \
-        	-e "s#\@BINDIR\@#@bindir@#g" \
-        	-e "s#\@SBINDIR\@#@sbindir@#g" \
+        	-e "s#\@BINDIR\@#@CONFIG_BINDIR@#g" \
+        	-e "s#\@SBINDIR\@#@CONFIG_SBINDIR@#g" \
         	-e "s#\@VERSION\@#@VERSION@#g" \
         	-e "s#\@VERDATE\@#@VERDATE@#g" \
         	-e "s#\@PACKAGE\@#@PACKAGE@#g" \
-        	-e "s#\@SPOOLDIR\@#@SPOOLDIR@#g" \
-        	-e "s#\@I4LCONFDIR\@#@I4LCONFDIR@#g" \
-        	-e "s#\@LOGFILEDIR\@#@LOGFILEDIR@#g" \
-        	-e "s#\@PIDFILEDIR\@#@RUNDIR@#g" \
-        	-e "s#\@LCKFILEDIR\@#@LOCKDIR@#g" \
+        	-e "s#\@SPOOLDIR\@#@VBOX_SPOOLDIR@#g" \
+        	-e "s#\@I4LCONFDIR\@#@ISDN_GLOBAL_CONFIG@#g" \
+        	-e "s#\@LOGFILEDIR\@#@VBOX_LOGDIR@#g" \
+        	-e "s#\@PIDFILEDIR\@#@VBOX_PIDDIR@#g" \
+        	-e "s#\@LCKFILEDIR\@#@VBOX_LCKDIR@#g" \
         	-e "s#\@MAILCMD\@#/usr/bin/mail#g" \
 		< $< > $@