Index: /trunk/Config.kmk
===================================================================
--- /trunk/Config.kmk	(revision 48282)
+++ /trunk/Config.kmk	(revision 48283)
@@ -2704,10 +2704,14 @@
  SDK_VBOX_ZLIB_INCS  ?= $(PATH_ROOT)/src/libs/zlib-1.2.6
  SDK_VBOX_ZLIB_LIBS  ?= $(PATH_STAGE_LIB)/VBox-zlib$(VBOX_SUFF_LIB)
- SDK_VBOX_ZLIB_LIBS.x86 ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)
 else
  SDK_VBOX_ZLIB_INCS  ?=
  SDK_VBOX_ZLIB_LIBS  ?= z
- SDK_VBOX_ZLIB_LIBS.x86 ?= z
  SDK_VBOX_ZLIB_DEFS.linux ?= _LARGEFILE64_SOURCE
+endif
+
+SDK_VBOX_ZLIB-x86    = .
+SDK_VBOX_ZLIB-x86_EXTENDS = VBOX_ZLIB
+if1of ($(KBUILD_TARGET), os2 solaris win)
+ SDK_VBOX_ZLIB_LIBS-x86  ?= $(PATH_STAGE_LIB)/VBox-zlib-x86$(VBOX_SUFF_LIB)
 endif
 
Index: /trunk/src/VBox/Runtime/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Runtime/Makefile.kmk	(revision 48282)
+++ /trunk/src/VBox/Runtime/Makefile.kmk	(revision 48283)
@@ -1439,5 +1439,5 @@
 endif
 VBoxRT-x86_LIBS                  += \
-	$(SDK_VBOX_ZLIB_LIBS.x86)
+	$(SDK_VBOX_ZLIB_LIBS-x86)
 ifndef SDK_VBOX_OPENSSL_LIBS
  VBoxRT-x86_LIBS                 += \