diff --git a/conf_windows.pri b/conf_windows.pri
index 99d46e25b..3107ce0ad 100644
--- a/conf_windows.pri
+++ b/conf_windows.pri
@@ -4,9 +4,6 @@
 CONFIG += release
 #CONFIG += qca-static
 
-# tell iris to use our internal libz
-CONFIG += psi-winzlib
-
 # OpenSSL
 qca-static {
 	DEFINES += HAVE_OPENSSL
diff --git a/configure b/configure
index e35d34632..bd6fbc169 100755
--- a/configure
+++ b/configure
@@ -867,8 +867,8 @@ public:
 		if(!success)
 			return false;
 
-		conf->addIncludePath(ossl_inc);
-		conf->addLib(QString("-L") + ossl_lib);
+		conf->addIncludePath(ossl_inc.replace("\\\", "\\\\\\\"));
+		conf->addLib(QString("-L") + ossl_lib.replace("\\\", "\\\\\\\"));
 		conf->addLib(libname_success);
 
 		conf->addDefine("HAVE_OPENSSL");
@@ -962,20 +962,9 @@ public:
 	qc_zlib(Conf *c) : ConfObj(c) {}
 	QString name() const { return "zlib"; }
 	QString shortname() const { return "zlib"; }
-#ifdef Q_OS_WIN
-	QString resultString() const
-	{
-		return "using bundled";
-	}
-#endif
 
 	bool exec()
 	{
-#ifdef Q_OS_WIN
-		// HACK: on windows, always use psi's bundled zlib
-		conf->addExtra("CONFIG += psi-winzlib psi-minizip");
-		return true;
-#else
 		QStringList incs;
 		QString version, libs, other;
 		QString s;
@@ -991,7 +980,7 @@ public:
 				if(!conf->findHeader("zlib.h", QStringList(), &s))
 					return false;
 			}
-			incs.append(s);
+			incs.append(s.replace("\\\", "\\\\\\\"));
 
 			s = conf->getenv("QC_WITH_ZLIB_LIB");
 			if(!s.isEmpty()) {
@@ -1002,7 +991,11 @@ public:
 				if(!conf->findLibrary("z", &s))
 					return false;
 			}
-			libs = s.isEmpty()? "-lz" : QString("-L%1 -lz").arg(s);
+			if (!s.isEmpty()) {
+				libs = QString("-L%1 -lz").arg(s.replace("\\\", "\\\\\\\"));
+			} else {
+				libs = s.isEmpty()? "-lz" : QString("-L%1 -lz").arg(s);
+			}
 		}
 
 		foreach(const QString &inc, incs) {
@@ -1010,6 +1003,11 @@ public:
 		}
 		conf->addLib(libs);
 
+#ifdef Q_OS_WIN
+		// HACK: on windows, always use psi's bundled minizip
+		conf->addExtra("CONFIG += psi-minizip");
+		return true;
+#else
 		incs.clear();
 		libs.clear();
 		if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
diff --git a/configure.exe b/configure.exe
index 959a0c973..7490cb309 100644
Binary files a/configure.exe and b/configure.exe differ
diff --git a/qcm/openssl.qcm b/qcm/openssl.qcm
index ae18c23b6..0ed4b03b1 100644
--- a/qcm/openssl.qcm
+++ b/qcm/openssl.qcm
@@ -68,8 +68,8 @@ public:
 		if(!success)
 			return false;
 
-		conf->addIncludePath(ossl_inc);
-		conf->addLib(QString("-L") + ossl_lib);
+		conf->addIncludePath(ossl_inc.replace("\\\", "\\\\\\\"));
+		conf->addLib(QString("-L") + ossl_lib.replace("\\\", "\\\\\\\"));
 		conf->addLib(libname_success);
 
 		conf->addDefine("HAVE_OPENSSL");
diff --git a/qcm/zlib.qcm b/qcm/zlib.qcm
index c7f60f864..86b97fbba 100644
--- a/qcm/zlib.qcm
+++ b/qcm/zlib.qcm
@@ -15,20 +15,9 @@ public:
 	qc_zlib(Conf *c) : ConfObj(c) {}
 	QString name() const { return "zlib"; }
 	QString shortname() const { return "zlib"; }
-#ifdef Q_OS_WIN
-	QString resultString() const
-	{
-		return "using bundled";
-	}
-#endif
 
 	bool exec()
 	{
-#ifdef Q_OS_WIN
-		// HACK: on windows, always use psi's bundled zlib
-		conf->addExtra("CONFIG += psi-winzlib psi-minizip");
-		return true;
-#else
 		QStringList incs;
 		QString version, libs, other;
 		QString s;
@@ -44,7 +33,7 @@ public:
 				if(!conf->findHeader("zlib.h", QStringList(), &s))
 					return false;
 			}
-			incs.append(s);
+			incs.append(s.replace("\\\", "\\\\\\\"));
 
 			s = conf->getenv("QC_WITH_ZLIB_LIB");
 			if(!s.isEmpty()) {
@@ -55,7 +44,11 @@ public:
 				if(!conf->findLibrary("z", &s))
 					return false;
 			}
-			libs = s.isEmpty()? "-lz" : QString("-L%1 -lz").arg(s);
+			if (!s.isEmpty()) {
+				libs = QString("-L%1 -lz").arg(s.replace("\\\", "\\\\\\\"));
+			} else {
+				libs = s.isEmpty()? "-lz" : QString("-L%1 -lz").arg(s);
+			}
 		}
 
 		foreach(const QString &inc, incs) {
@@ -63,6 +56,11 @@ public:
 		}
 		conf->addLib(libs);
 
+#ifdef Q_OS_WIN
+		// HACK: on windows, always use psi's bundled minizip
+		conf->addExtra("CONFIG += psi-minizip");
+		return true;
+#else
 		incs.clear();
 		libs.clear();
 		if(!conf->findPkgConfig("minizip", VersionAny, "", &version, &incs, &libs, &other)) {
diff --git a/src/conf_iris.pri b/src/conf_iris.pri
index 3a7f8200e..3978e3f89 100644
--- a/src/conf_iris.pri
+++ b/src/conf_iris.pri
@@ -13,12 +13,6 @@ else {
 	CONFIG += crypto
 }
 
-psi-winzlib {
-    INCLUDEPATH += $$PWD/libpsi/tools/zip/minizip/win32
-    DEPENDPATH  += $$PWD/libpsi/tools/zip/minizip/win32
-    LIBS += $$PWD/libpsi/tools/zip/minizip/win32/libz.a
-}
-
 mac {
 	# Universal binaries
 	qc_universal:contains(QT_CONFIG,x86):contains(QT_CONFIG,ppc) {
diff --git a/src/libpsi b/src/libpsi
index 172b98808..d776e9e25 160000
--- a/src/libpsi
+++ b/src/libpsi
@@ -1 +1 @@
-Subproject commit 172b9880894bbbb944ff644dd295b8c9425d8242
+Subproject commit d776e9e2587ef964f531fa6f7b45e082c7c641cc