diff --git a/reactos/tools/rbuild/backend/mingw/mingw.cpp b/reactos/tools/rbuild/backend/mingw/mingw.cpp
index b049be9405d..01350ee0af2 100644
--- a/reactos/tools/rbuild/backend/mingw/mingw.cpp
+++ b/reactos/tools/rbuild/backend/mingw/mingw.cpp
@@ -1065,9 +1065,9 @@ MingwBackend::OutputRegistryInstallTarget ()
 	fprintf ( fMakefile,
 	          "\t$(ECHO_MKHIVE)\n" );
 	fprintf ( fMakefile,
-	          "\t$(MKHIVE_TARGET) bootdata %s bootdata%chiveinst.inf\n",
-	          system32ConfigDirectory.c_str (),
-                  cSep );
+	          "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%chiveinst.inf\n",
+	          cSep, system32ConfigDirectory.c_str (),
+                  cSep, cSep );
 	fprintf ( fMakefile,
 	          "\n" );
 }
diff --git a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
index 74337674877..b9ec9e3ddf4 100644
--- a/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
+++ b/reactos/tools/rbuild/backend/mingw/modulehandler.cpp
@@ -3087,10 +3087,9 @@ MingwLiveIsoModuleHandler::OutputRegistryCommands ( string& livecdDirectory )
 	fprintf ( fMakefile,
 	          "\t$(ECHO_MKHIVE)\n" );
 	fprintf ( fMakefile,
-	          "\t$(MKHIVE_TARGET) bootdata %s bootdata%clivecd.inf bootdata%chiveinst.inf\n",
-	          reactosSystem32ConfigDirectory.c_str (),
-                  cSep,
-                  cSep );
+	          "\t$(MKHIVE_TARGET) boot%cbootdata %s boot%cbootdata%clivecd.inf boot%cbootdata%chiveinst.inf\n",
+	          cSep, reactosSystem32ConfigDirectory.c_str (),
+                  cSep, cSep, cSep, cSep );
 }
 
 void
diff --git a/reactos/tools/winebuild/winebuild.mak b/reactos/tools/winebuild/winebuild.mak
index f5a5c19b8b3..af47b69471b 100644
--- a/reactos/tools/winebuild/winebuild.mak
+++ b/reactos/tools/winebuild/winebuild.mak
@@ -32,7 +32,7 @@ WINEBUILD_SOURCES = $(addprefix $(WINEBUILD_BASE_), \
 WINEBUILD_OBJECTS = \
   $(addprefix $(INTERMEDIATE_), $(WINEBUILD_SOURCES:.c=.o))
 
-WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API -Iinclude -Iinclude/reactos -Iinclude/reactos/wine
+WINEBUILD_HOST_CFLAGS = $(TOOLS_CFLAGS) -D__USE_W32API -Iinclude/reactos/wine -Iinclude -Iinclude/reactos
 
 WINEBUILD_HOST_LFLAGS = $(TOOLS_LFLAGS)