diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri
index 77a1b246b9a1056ff12cde55c19cbf96e1c7a9dd..b1f607b7e7fc141bd6d66942a52396be8fdfe029 100644
--- a/src/3rdparty/zlib_dependency.pri
+++ b/src/3rdparty/zlib_dependency.pri
@@ -1,10 +1,7 @@
 # zlib dependency satisfied by bundled 3rd party zlib or system zlib
 contains(QT_CONFIG, system-zlib) {
-    symbian:                 LIBS_PRIVATE += -llibz
-    else:if(unix|win32-g++*):LIBS_PRIVATE += -lz
-    else:                    LIBS += zdll.lib
+    if(unix|win32-g++*): LIBS_PRIVATE += -lz
+    else:                LIBS += zdll.lib
 } else {
-# We could copy the zlib sources over to this module, but for now we don't.
-#    INCLUDEPATH +=  $$PWD/zlib
-    error("zlib not available: Qt was not built with the system's zlib")
+    INCLUDEPATH += $$[QT_INSTALL_HEADERS]/QtZlib
 }
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro
index 5bde0c700005d0284fb41accda2ee3d4f5208f9b..79be7aea59ed1e8a69492b77cbefb22c87bf4555 100644
--- a/src/plugins/imageformats/imageformats.pro
+++ b/src/plugins/imageformats/imageformats.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 SUBDIRS = \
     tga \
-    wbmp
-contains(QT_CONFIG, system-zlib): SUBDIRS += mng tiff
+    wbmp \
+    mng \
+    tiff