diff --git a/Makefile.common b/Makefile.common
index 705f24cbaf..cc5357e75e 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -964,7 +964,7 @@ ifeq ($(HAVE_ZLIB), 1)
    OBJ += $(ZLIB_OBJS)
    DEFINES += -DHAVE_ZLIB
    HAVE_COMPRESSION = 1
-   ifeq ($(WANT_ZLIB), 1)
+   ifeq ($(HAVE_BUILTINZLIB), 1)
       DEFINES += -DWANT_ZLIB
    else
       LIBS += -lz
@@ -1001,7 +1001,7 @@ ifdef HAVE_COMPRESSION
    DEFINES += -DHAVE_COMPRESSION
 endif
 
-ifeq ($(WANT_ZLIB),1)
+ifeq ($(HAVE_BUILTINZLIB),1)
    OBJ += deps/zlib/adler32.o \
           deps/zlib/compress.o \
           deps/zlib/crc32.o \
diff --git a/qb/config.params.sh b/qb/config.params.sh
index f03cfe2366..8a4f538980 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -45,6 +45,7 @@ HAVE_EGL=auto              # EGL context support
 HAVE_VG=auto               # OpenVG support
 HAVE_CG=auto               # Cg shader support
 HAVE_LIBXML2=auto          # libxml2 support
+HAVE_BUILTINZLIB=no        # Bake in zlib
 HAVE_ZLIB=auto             # zlib support (ZIP extract, PNG decoding/encoding)
 HAVE_FBO=auto              # render-to-texture (FBO) support
 HAVE_ALSA=auto             # ALSA support