diff --git a/utils/Makefile.in b/utils/Makefile.in
index a349c710e6..c115688228 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -34,14 +34,14 @@ clean:
 	(cd emulator/src && $(MAKE) clean)
 	(cd helpview/src && $(MAKE) clean)
 	(cd tex2rtf/src && $(MAKE) clean)
-	(cd HelpGen && $(MAKE) clean)
+	(cd HelpGen/src && $(MAKE) clean)
 
 distclean: clean
 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 	(cd emulator/src && $(MAKE) distclean)
 	(cd helpview/src && $(MAKE) distclean)
 	(cd tex2rtf/src && $(MAKE) distclean)
-	(cd HelpGen && $(MAKE) distclean)
+	(cd HelpGen/src && $(MAKE) distclean)
 
 emulator: 
 	(cd emulator/src && $(MAKE) all)
@@ -62,16 +62,16 @@ install-strip_tex2rtf:
 	(cd tex2rtf/src && $(MAKE) install-strip)
 
 helpgen: 
-	(cd HelpGen && $(MAKE) all)
+	(cd HelpGen/src && $(MAKE) all)
 
 install_helpgen: 
-	(cd HelpGen && $(MAKE) install)
+	(cd HelpGen/src && $(MAKE) install)
 
 uninstall_helpgen: 
-	(cd HelpGen && $(MAKE) uninstall)
+	(cd HelpGen/src && $(MAKE) uninstall)
 
 install-strip_helpgen: 
-	(cd HelpGen && $(MAKE) install-strip)
+	(cd HelpGen/src && $(MAKE) install-strip)
 
 
 # Include dependency info, if present:
diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index 8bf563e2dc..e7387ec086 100644
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -61,7 +61,7 @@ clean:
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>tex2rtf.bat
 	call tex2rtf.bat
 	@del tex2rtf.bat
-	@echo cd HelpGen >helpgen.bat
+	@echo cd HelpGen\src >helpgen.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpgen.bat
 	call helpgen.bat
 	@del helpgen.bat
@@ -85,7 +85,7 @@ tex2rtf:
 	@del tex2rtf.bat
 
 helpgen: 
-	@echo cd HelpGen >helpgen.bat
+	@echo cd HelpGen\src >helpgen.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpgen.bat
 	call helpgen.bat
 	@del helpgen.bat
diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 83804d6825..3dd5d3eb8b 100644
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -41,7 +41,7 @@ clean:
 	$(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) clean
-	$(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) clean
+	$(MAKE) -C HelpGen\src -f makefile.gcc $(MAKEARGS) clean
 
 emulator: 
 	$(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
@@ -53,7 +53,7 @@ tex2rtf:
 	$(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) all
 
 helpgen: 
-	$(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
+	$(MAKE) -C HelpGen\src -f makefile.gcc $(MAKEARGS) all
 
 .PHONY: all clean emulator helpview tex2rtf helpgen
 
diff --git a/utils/makefile.vc b/utils/makefile.vc
index f40e5661f9..add64fdb8e 100644
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -42,34 +42,34 @@ clean:
 	-if exist .\*.pch del .\*.pch
 	cd emulator\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
-	cd $(MAKEDIR)
+	cd "$(MAKEDIR)"
 	cd helpview\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
-	cd $(MAKEDIR)
+	cd "$(MAKEDIR)"
 	cd tex2rtf\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
-	cd $(MAKEDIR)
-	cd HelpGen
+	cd "$(MAKEDIR)"
+	cd HelpGen\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
-	cd $(MAKEDIR)
+	cd "$(MAKEDIR)"
 
 sub_emulator: 
 	cd emulator\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
-	cd $(MAKEDIR)
+	cd "$(MAKEDIR)"
 
 sub_helpview: 
 	cd helpview\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
-	cd $(MAKEDIR)
+	cd "$(MAKEDIR)"
 
 sub_tex2rtf: 
 	cd tex2rtf\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
-	cd $(MAKEDIR)
+	cd "$(MAKEDIR)"
 
 sub_helpgen: 
-	cd HelpGen
+	cd HelpGen\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
-	cd $(MAKEDIR)
+	cd "$(MAKEDIR)"
 
diff --git a/utils/makefile.wat b/utils/makefile.wat
index d9c75fb7ad..4ee6ac62eb 100644
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -65,7 +65,7 @@ clean : .SYMBOLIC
 	cd tex2rtf\src
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
-	cd HelpGen
+	cd HelpGen\src
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
 
@@ -85,7 +85,7 @@ tex2rtf : .SYMBOLIC
 	cd $(WATCOM_CWD)
 
 helpgen : .SYMBOLIC 
-	cd HelpGen
+	cd HelpGen\src
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
 
diff --git a/utils/utils.bkl b/utils/utils.bkl
index 1a48eff3f6..3852b27404 100644
--- a/utils/utils.bkl
+++ b/utils/utils.bkl
@@ -2,7 +2,7 @@
 <makefile>
 
     <include file="../build/bakefiles/config.bkl"/>
-    
+
     <template id="sub">
         <dependency-of>all</dependency-of>
     </template>
@@ -11,19 +11,19 @@
         <dir>emulator/src</dir>
         <installable>no</installable>
     </subproject>
-    
+
     <subproject id="helpview" template="sub">
         <dir>helpview/src</dir>
         <installable>no</installable>
     </subproject>
-    
+
     <subproject id="tex2rtf" template="sub">
         <dir>tex2rtf/src</dir>
         <installable>yes</installable>
     </subproject>
-    
+
     <subproject id="helpgen" template="sub">
-        <dir>HelpGen</dir>
+        <dir>HelpGen/src</dir>
         <installable>yes</installable>
     </subproject>