diff --git a/trunk/Makefile b/trunk/Makefile
index 7470eb4..1fcdd78 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -11,9 +11,10 @@ SYS=posix
 CRYPTO=OPENSSL
 #CRYPTO=POLARSSL
 #CRYPTO=GNUTLS
-LIB_GNUTLS=-lgnutls -lgcrypt
-LIB_OPENSSL=-lssl -lcrypto
-LIB_POLARSSL=-lpolarssl
+LIBZ=-lz
+LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ)
+LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
+LIB_POLARSSL=-lpolarssl $(LIBZ)
 CRYPTO_LIB=$(LIB_$(CRYPTO))
 DEF_=-DNO_CRYPTO
 CRYPTO_DEF=$(DEF_$(CRYPTO))
@@ -33,7 +34,7 @@ MANDIR=$(DESTDIR)$(mandir)
 
 LIBS_posix=
 LIBS_mingw=-lws2_32 -lwinmm -lgdi32
-LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS)
+LIBS=$(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS)
 
 THREADLIB_posix=-lpthread
 THREADLIB_mingw=
diff --git a/trunk/librtmp/hashswf.c b/trunk/librtmp/hashswf.c
index 06d2bbb..33f18c1 100644
--- a/trunk/librtmp/hashswf.c
+++ b/trunk/librtmp/hashswf.c
@@ -68,8 +68,6 @@ extern TLS_CTX RTMP_TLS_ctx;
 
 #endif /* CRYPTO */
 
-#include <zlib.h>
-
 #define	AGENT	"Mozilla/5.0"
 
 HTTPResult
@@ -284,6 +282,8 @@ leave:
 
 #ifdef CRYPTO
 
+#include <zlib.h>
+
 #define CHUNK	16384
 
 struct info