diff --git a/makefiles/Makefile.archive.mk b/makefiles/Makefile.archive.mk
index 68ce9e4516..cf2b09dea3 100644
--- a/makefiles/Makefile.archive.mk
+++ b/makefiles/Makefile.archive.mk
@@ -144,32 +144,43 @@ java_archive:
 	$(COPY) examples$Scom$Sgoogle$Sortools$Ssamples$S*.java temp$S$(INSTALL_DIR)$Sexamples$Scom$Sgoogle$Sortools$Ssamples
 
 
-
 ifeq "$(SYSTEM)" "win"
 fz_archive: fz
 	-$(DELREC) temp
 	mkdir temp
-	mkdir temp$S$(INSTALL_DIR)
-	mkdir temp$S$(INSTALL_DIR)$Sbin
-	mkdir temp$S$(INSTALL_DIR)$Sshare
-	mkdir temp$S$(INSTALL_DIR)$Sshare$Sminizinc
-	$(COPY) LICENSE-2.0.txt temp$S$(INSTALL_DIR)
-	$(COPY) bin$Sfz.exe temp$S$(INSTALL_DIR)$Sbin$Sfzn-or-tools.exe
-	$(COPY) src$Sflatzinc$Smznlib$S*.mzn temp$S$(INSTALL_DIR)$Sshare$Sminizinc
-	cd temp && ..$Stools$Szip.exe -r ..$Sor-tools.flatzinc.$(PORT)_$(OR_TOOLS_VERSION).zip $(INSTALL_DIR)
+	mkdir temp$S$(FZ_INSTALL_DIR)
+	mkdir temp$S$(FZ_INSTALL_DIR)$Sbin
+	mkdir temp$S$(FZ_INSTALL_DIR)$Sshare
+	mkdir temp$S$(FZ_INSTALL_DIR)$Sshare$Sminizinc
+	$(COPY) LICENSE-2.0.txt temp$S$(FZ_INSTALL_DIR)
+	$(COPY) bin$Sfz.exe temp$S$(FZ_INSTALL_DIR)$Sbin$Sfzn-or-tools.exe
+	$(COPY) src$Sflatzinc$Smznlib$S*.mzn temp$S$(FZ_INSTALL_DIR)$Sshare$Sminizinc
+	cd temp && ..$Stools$Szip.exe -r ..$Sor-tools.flatzinc.$(PORT)_$(OR_TOOLS_VERSION).zip $(FZ_INSTALL_DIR)
 	-$(DELREC) temp
 else
-fz_archive: $(LIB_DIR)$S$(LIB_PREFIX)ortools.$(LIB_SUFFIX)
-	mkdir temp
-	mkdir temp$S$(INSTALL_DIR)
-	mkdir temp$S$(INSTALL_DIR)$Sbin
-	mkdir temp$S$(INSTALL_DIR)$Sshare
-	mkdir temp$S$(INSTALL_DIR)$Sshare$Sminizinc
-	$(COPY) LICENSE-2.0.txt temp$S$(INSTALL_DIR)
-	$(COPY) bin$Sfz temp$S$(INSTALL_DIR)$Sbin$Sfzn-or-tools
-	$(COPY) src$Sflatzinc$Smznlib$S* temp$S$(INSTALL_DIR)$Sshare$Sminizinc
-	cd temp && tar cvzf ..$Sor-tools.flatzinc.$(PORT)_$(OR_TOOLS_VERSION).tar.gz $(INSTALL_DIR)
+fz_archive: $(LIB_DIR)$S$(LIB_PREFIX)ortools.$(LIB_SUFFIX) $(LIB_DIR)$S$(LIB_PREFIX)fz.$(LIB_SUFFIX)
 	-$(DELREC) temp
+	mkdir temp
+	mkdir temp$S$(FZ_INSTALL_DIR)
+	mkdir temp$S$(FZ_INSTALL_DIR)$Sbin
+	mkdir temp$S$(FZ_INSTALL_DIR)$Slib
+	mkdir temp$S$(FZ_INSTALL_DIR)$Sshare
+	mkdir temp$S$(FZ_INSTALL_DIR)$Sshare$Sminizinc
+	mkdir temp$S$(FZ_INSTALL_DIR)$Sexamples
+	$(COPY) LICENSE-2.0.txt temp$S$(FZ_INSTALL_DIR)
+	$(COPY) bin$Sfz temp$S$(FZ_INSTALL_DIR)$Sbin$Sfzn-or-tools
+	$(COPY) $(LIB_DIR)$S$(LIB_PREFIX)ortools.$(LIB_SUFFIX) temp$S$(FZ_INSTALL_DIR)$Slib
+	$(COPY) $(LIB_DIR)$S$(LIB_PREFIX)fz.$(LIB_SUFFIX) temp$S$(FZ_INSTALL_DIR)$Slib
+	$(COPY) src$Sflatzinc$Smznlib$S* temp$S$(FZ_INSTALL_DIR)$Sshare$Sminizinc
+	$(COPY) examples$Sflatzinc$S* temp$S$(FZ_INSTALL_DIR)$Sexamples
+ifeq ($(PLATFORM),MACOSX)
+	$(COPY) tools$Sfz_install_libs_mac.sh temp$S$(FZ_INSTALL_DIR)
+	chmod u+x temp/$(FZ_INSTALL_DIR)/fz_install_libs_mac.sh
+	cd temp$S$(FZ_INSTALL_DIR) && ./fz_install_libs_mac.sh
+	$(RM) temp$S$(FZ_INSTALL_DIR)$Sfz_install_libs_mac.sh
+endif
+	cd temp && tar cvzf ..$S$(FZ_INSTALL_DIR).tar.gz $(FZ_INSTALL_DIR)
+#	-$(DELREC) temp
 endif
 
 
@@ -189,3 +200,17 @@ endif
 	cd temp$S$(INSTALL_DIR) && $(MAKE) test
 	-$(DELREC) $(INSTALL_DIR)
 	$(RENAME) lib2 lib
+
+test_fz_archive: $(FZ_INSTALL_DIR)$(ARCHIVE_EXT)
+	-$(DELREC) temp
+	$(MKDIR) temp
+#this is to make sure the archive tests don't use the root libraries
+	$(RENAME) lib lib2
+ifeq "$(SYSTEM)" "win"
+	tools$Sunzip.exe $(FZ_INSTALL_DIR).zip -d temp
+else
+	tar -x -v -f $(FZ_INSTALL_DIR).tar.gz -C temp
+endif
+	cd temp$S$(FZ_INSTALL_DIR) && .$Sbin$S$(FZ_EXE) examples$Scircuit_test.fzn
+	-$(DELREC) $(INSTALL_DIR)
+	$(RENAME) lib2 lib
diff --git a/makefiles/Makefile.port b/makefiles/Makefile.port
index 3add51b86a..52a4b5a2ed 100755
--- a/makefiles/Makefile.port
+++ b/makefiles/Makefile.port
@@ -166,6 +166,7 @@ endif
 OR_TOOLS_VERSION := $(OR_TOOLS_MAJOR).$(OR_TOOLS_MINOR).$(GIT_REVISION)
 OR_TOOLS_SHORT_VERSION := $(OR_TOOLS_MAJOR).$(OR_TOOLS_MINOR)
 INSTALL_DIR=or-tools_$(PORT)_v$(OR_TOOLS_VERSION)
+FZ_INSTALL_DIR=or-tools_flatzinc_$(PORT)_v$(OR_TOOLS_VERSION)
 
 printport:
 	@echo SHELL = $(SHELL)
diff --git a/makefiles/Makefile.unix b/makefiles/Makefile.unix
index 7c0f315ec2..8b71112e0e 100755
--- a/makefiles/Makefile.unix
+++ b/makefiles/Makefile.unix
@@ -24,6 +24,7 @@ EX_DIR  = $(OR_ROOT)examples
 INC_DIR = $(OR_ROOT)src
 DEP_BIN_DIR = $(OR_ROOT)dependencies/install/bin
 
+
 O = o
 E =
 LDOUT = -o # need the space.
@@ -36,6 +37,7 @@ S = /
 CPSEP = :
 SED = sed
 ARCHIVE_EXT = .tar.gz
+FZ_EXE = fzn-or-tools$E
 
 # This is needed to find python.h
 PYTHON_INC = -I/usr/include/python$(UNIX_PYTHON_VER) -I/usr/lib/python$(UNIX_PYTHON_VER) $(ADD_PYTHON_INC)
diff --git a/makefiles/Makefile.win b/makefiles/Makefile.win
index de0d07b8be..9f8f3841cf 100755
--- a/makefiles/Makefile.win
+++ b/makefiles/Makefile.win
@@ -41,6 +41,7 @@ BISON = dependencies\install\bin\win_bison.exe
 FLEX = dependencies\install\bin\win_flex.exe
 CMAKE = cmake
 ARCHIVE_EXT = .zip
+FZ_EXE = fzn-or-tools$E
 
 # Compilation macros.
 DEBUG=/O2 -DNDEBUG