diff --git a/auto/lib/make b/auto/lib/make
index eb7d028..8bb32ca3 100644
--- a/auto/lib/make
+++ b/auto/lib/make
@@ -2,11 +2,7 @@
 if [ "$PLATFORM" != "win32" ]; then
 
     if [ $PCRE != NO ]; then
-        echo "$PCRE/.libs/libpcre.a:"                            >> $MAKEFILE
-        echo "	cd $PCRE \\"                                     >> $MAKEFILE
-        echo "	&& ./configure --disable-shared \\"              >> $MAKEFILE
-        echo "	&& \$(MAKE)"                                     >> $MAKEFILE
-        echo                                                     >> $MAKEFILE
+        . auto/lib/pcre/make
     fi
 
 
@@ -16,24 +12,7 @@
 
 
     if [ $ZLIB != NO ]; then
-        echo "$ZLIB/libz.a:"                                     >> $MAKEFILE
-
-        case $PLATFORM in
-
-            *:i386)
-                echo "	cd $ZLIB \\"                             >> $MAKEFILE
-                echo "	&& cp contrib/asm686/match.S . \\"       >> $MAKEFILE
-                echo "	&& CFLAGS=\"-O3 -DASMV\" ./configure \\" >> $MAKEFILE
-                echo "	&& \$(MAKE) OBJA=match.o"                >> $MAKEFILE
-            ;;
-
-            *)
-                echo "	cd $ZLIB && ./configure && \$(MAKE)"     >> $MAKEFILE
-            ;;
-
-        esac
-
-        echo                                                     >> $MAKEFILE
+        . auto/lib/zlib/make
     fi
 
 fi
diff --git a/auto/lib/pcre/make b/auto/lib/pcre/make
new file mode 100644
index 0000000..8366686
--- /dev/null
+++ b/auto/lib/pcre/make
@@ -0,0 +1,7 @@
+
+echo "$PCRE/.libs/libpcre.a:"                            >> $MAKEFILE
+echo "	cd $PCRE \\"                                     >> $MAKEFILE
+echo "	&& ./configure --disable-shared \\"              >> $MAKEFILE
+echo "	&& \$(MAKE)"                                     >> $MAKEFILE
+echo                                                     >> $MAKEFILE
+
diff --git a/auto/lib/zlib/make b/auto/lib/zlib/make
new file mode 100644
index 0000000..78022c3
--- /dev/null
+++ b/auto/lib/zlib/make
@@ -0,0 +1,19 @@
+
+echo "$ZLIB/libz.a:"                                     >> $MAKEFILE
+
+case $PLATFORM in
+
+    *:i386)
+        echo "	cd $ZLIB \\"                             >> $MAKEFILE
+        echo "	&& cp contrib/asm686/match.S . \\"       >> $MAKEFILE
+        echo "	&& CFLAGS=\"-O3 -DASMV\" ./configure \\" >> $MAKEFILE
+        echo "	&& \$(MAKE) OBJA=match.o"                >> $MAKEFILE
+    ;;
+
+    *)
+        echo "	cd $ZLIB && ./configure && \$(MAKE)"     >> $MAKEFILE
+    ;;
+
+esac
+
+echo                                                     >> $MAKEFILE