diff --git a/reactos/lib/3rdparty/zlib/zlib.mak b/reactos/lib/3rdparty/zlib/zlib.mak
index 23ece960ea4..5af0cce3e25 100755
--- a/reactos/lib/3rdparty/zlib/zlib.mak
+++ b/reactos/lib/3rdparty/zlib/zlib.mak
@@ -1,4 +1,4 @@
-ZLIB_BASE = $(LIB_BASE_)zlib
+ZLIB_BASE = $(LIB_BASE_)3rdparty$(SEP)zlib
 ZLIB_BASE_ = $(ZLIB_BASE)$(SEP)
 ZLIB_INT = $(INTERMEDIATE_)$(ZLIB_BASE)
 ZLIB_INT_ = $(INTERMEDIATE_)$(ZLIB_BASE)$(SEP)
diff --git a/reactos/lib/lib.mak b/reactos/lib/lib.mak
index 9aad4a4883b..ddf02e6ebe4 100644
--- a/reactos/lib/lib.mak
+++ b/reactos/lib/lib.mak
@@ -2,3 +2,4 @@ LIB_BASE = lib
 LIB_BASE_ = $(LIB_BASE)$(SEP)
 
 include lib/inflib/inflib.mak
+include lib/3rdparty/zlib/zlib.mak
diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index 195e6da3582..b049be9405d 100644
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -1023,11 +1023,11 @@ MingwBackend::OutputModuleInstallTargets ()
 string
 MingwBackend::GetRegistrySourceFiles ()
 {
-	return "bootdata" + sSep + "hivecls.inf "
-		"bootdata" + sSep + "hivedef.inf "
-		"bootdata" + sSep + "hiveinst.inf "
-		"bootdata" + sSep + "hivesft.inf "
-		"bootdata" + sSep + "hivesys.inf";
+	return "boot" + sSep + "bootdata" + sSep + "hivecls.inf "
+		"boot" + sSep + "bootdata" + sSep + "hivedef.inf "
+		"boot" + sSep + "bootdata" + sSep + "hiveinst.inf "
+		"boot" + sSep + "bootdata" + sSep + "hivesft.inf "
+		"boot" + sSep + "bootdata" + sSep + "hivesys.inf";
 }
 
 string
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 94a5cbda7f7..74337674877 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -2937,7 +2937,7 @@ MingwIsoModuleHandler::GenerateIsoModuleTarget ()
 	string reactosInf = PassThruCacheDirectory (
 		NormalizeFilename ( bootcdReactosNoFixup + sSep + "reactos.inf" ),
 		backend->outputDirectory );
-	string reactosDff = NormalizeFilename ( "bootdata" + sSep + "packages" + sSep + "reactos.dff" );
+	string reactosDff = NormalizeFilename ( "boot" + sSep + "bootdata" + sSep + "packages" + sSep + "reactos.dff" );
 	string cdDirectories = GetCdDirectories ( bootcdDirectory );
 	vector<string> vCdFiles;
 	GetCdFiles ( vCdFiles );
@@ -3059,7 +3059,7 @@ MingwLiveIsoModuleHandler::OutputProfilesDirectoryCommands ( string& livecdDirec
 	CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" + sSep + "Desktop" );
 	CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" + sSep + "My Documents" );
 
-	string livecdIni = "bootdata" + sSep + "livecd.ini";
+	string livecdIni = "boot" + sSep + "bootdata" + sSep + "livecd.ini";
 	OutputCopyCommand ( livecdIni,
                         "freeldr.ini",
                         livecdDirectory );