diff --git a/build/globals.mak b/build/globals.mak
index 298bf0352..862dc97e5 100644
--- a/build/globals.mak
+++ b/build/globals.mak
@@ -116,6 +116,9 @@ BANKER :=				banker
 BIGLUMP :=				bl2
 TGA2GFX :=				Tga2Gfx
 
+RAR :=					rar
+BUILDCD :=				buildcd
+STRIPISO :=				stripiso
 
 # PSX and misc tools
 # ------------------
diff --git a/data/CDData/ZZZZZZZ.rar b/data/CDData/ZZZZZZZ.rar
new file mode 100644
index 000000000..b49c08def
Binary files /dev/null and b/data/CDData/ZZZZZZZ.rar differ
diff --git a/makefile.gaz b/makefile.gaz
index 2f1036d07..886f4d9e3 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -382,33 +382,36 @@ EUR_BOOTSTRAP_OUT	:=$(CD_DIR)/BOOTEUR.EXE
 EUR_CPE2X_PARAM		:=/CE
 
 cddata:
-#ifeq ($(USER_NAME),CDBUILD)
-	@$(MKDIR) -p $(CD_DIR)
-	@$(CPE2BIN) $(CPE_FILE) $(CD_DIR)/$(BIN_OUTFILE)
-	@$(CP) -u $(BIGLUMP_FILE) $(CD_DIR) -f
-	@$(TGA2GFX) graphics/screens/legal.tga $(CD_DIR)/LEGAL.GFX
-	@$(CP) -u Data/CdData/$(TERRITORY).cnf $(CD_DIR)/SYSTEM.CNF -f
-	@$(CP) -u Data/CdData/$(TERRITORY).ccs $(CD_BUILD_DIR)/$(TERRITORY).ccs
-	@PKUNZIP -n data/CDData/ZZZZZZZ.ZIP $(CD_DIR)
+ifeq ($(USER_NAME),CDBUILD)
+	$(MKDIR) -p $(CD_DIR)
+	$(CPE2BIN) $(CPE_FILE) $(CD_DIR)/$(BIN_OUTFILE)
+	$(CP) -u $(BIGLUMP_FILE) $(CD_DIR) -f
+	$(TGA2GFX) graphics/screens/legal.tga $(CD_DIR)/LEGAL.GFX
+	$(CP) -u Data/CdData/$(TERRITORY).cnf $(CD_DIR)/SYSTEM.CNF -f
+	$(CP) -u Data/CdData/$(TERRITORY).ccs $(CD_BUILD_DIR)/$(TERRITORY).ccs
+	$(PKUNZIP) -n data/CDData/ZZZZZZZ.ZIP $(CD_DIR)/ >nul
+	$(RAR) x data/CDData/ZZZZZZZ.RAR $(CD_DIR)/ -y >nul
+	$(ECHO) HERE
 
 # Compile bootstrap
-	@ccpsx -O2 -g $(BOOTSTRAP_IN) -c -Xo$801c0000 $(COMMON_CCFLAGS) -oPsxBoot.o
-	@slink -m -psx -c -v -z -o 0x801c0000 -cpemunge -we -wm -wo @$(BOOTSTRAP_DIR)/psxboot.ln,$(BOOTSTRAP_CPE),$(BOOTSTRAP_SYM),$(BOOTSTRAP_MAP)
-	@$(RM) PsxBoot.o
-	@Cpe2Exe $($(TERRITORY)_CPE2X_PARAM) $(BOOTSTRAP_CPE)
-	@$(CP) -u $(BOOTSTRAP_EXE) $($(TERRITORY)_BOOTSTRAP_OUT) -f
-	@$(ECHO) $(TERRITORY) Psx CD Built
+	ccpsx -O2 -g $(BOOTSTRAP_IN) -c -Xo$801c0000 $(COMMON_CCFLAGS) -oPsxBoot.o
+	slink -m -psx -c -v -z -o 0x801c0000 -cpemunge -we -wm -wo @$(BOOTSTRAP_DIR)/psxboot.ln,$(BOOTSTRAP_CPE),$(BOOTSTRAP_SYM),$(BOOTSTRAP_MAP)
+	$(RM) PsxBoot.o
+	Cpe2Exe $($(TERRITORY)_CPE2X_PARAM) $(BOOTSTRAP_CPE)
+	$(CP) -u $(BOOTSTRAP_EXE) $($(TERRITORY)_BOOTSTRAP_OUT) -f
+	$(ECHO) $(TERRITORY) Psx CD Built
 
 # build iso
-	@tools\BUILDCD.EXE -i$(CD_BUILD_DIR)/psx.img -l data/cddata/$(TERRITORY).cti
-	@tools\STRIPISO.EXE s 2352 $(CD_BUILD_DIR)/psx.img $(CD_BUILD_DIR)/$(TERRITORY).iso
-#	tools\STRIPISO.EXE s 2336 $(CD_BUILD_DIR)/psx.img $(CD_BUILD_DIR)/$(TERRITORY).iso
+	$(BUILDCD) -i$(CD_BUILD_DIR)/psx.img -l data/cddata/$(TERRITORY).cti
+	$(STRIPISO)s 2352 $(CD_BUILD_DIR)/psx.img $(CD_BUILD_DIR)/$(TERRITORY).iso
 	$(RM) $(CD_BUILD_DIR)/psx.img
 	$(RM) CDW900E.toc
 	$(RM) QSheet.toc
 	@$(ECHO) $(TERRITORY) Iso Built
 
-#endif
+endif
+
+#	tools\STRIPISO.EXE s 2336 $(CD_BUILD_DIR)/psx.img $(CD_BUILD_DIR)/$(TERRITORY).iso
 
 #----------------------------------------------------------------------------
 #	Main dependancy
diff --git a/tools/Rar.exe b/tools/Rar.exe
new file mode 100644
index 000000000..472656f14
Binary files /dev/null and b/tools/Rar.exe differ