diff --git a/reactos/Makefile b/reactos/Makefile
index 184d3176fc2..53d9f0421e0 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -415,7 +415,7 @@ PREAUTO := \
 	$(NCI_SERVICE_FILES)
 
 $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
-	${mkdir} $(INTERMEDIATE_)media$(SEP)inf 2>$(NUL)
+	${mkdir} $(OUTPUT_)media$(SEP)inf 2>$(NUL)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -rReactOS-$(ARCH).rbuild mingw
 	@$(MAKE) psdk
diff --git a/reactos/media/inf/inf.rbuild b/reactos/media/inf/inf.rbuild
index 6e3327f557f..0070d62ec93 100644
--- a/reactos/media/inf/inf.rbuild
+++ b/reactos/media/inf/inf.rbuild
@@ -14,7 +14,7 @@
 <installfile base="inf">nettcpip.inf</installfile>
 <installfile base="inf">ports.inf</installfile>
 <installfile base="inf">scsi.inf</installfile>
-<installfile base="inf" root="intermediate">syssetup.inf</installfile>
+<installfile base="inf" root="output">syssetup.inf</installfile>
 <installfile base="inf">usbport.inf</installfile>
 <installfile base="inf">usbstor.inf</installfile>
 <installfile base="inf">xboxdisp.inf</installfile>
diff --git a/reactos/tools/rbuild/syssetupgenerator.cpp b/reactos/tools/rbuild/syssetupgenerator.cpp
index acc64255901..caa765adb75 100644
--- a/reactos/tools/rbuild/syssetupgenerator.cpp
+++ b/reactos/tools/rbuild/syssetupgenerator.cpp
@@ -39,7 +39,7 @@ SysSetupGenerator::Generate ()
 	unsigned long errorLine;
 
 	string syssetupTemplate = "media" + sSep + "inf" + sSep + "syssetup.inf.tpl";
-	string syssetup = Environment::GetIntermediatePath() + sSep + "media" + sSep + "inf" + sSep + "syssetup.inf";
+	string syssetup = Environment::GetOutputPath() + sSep + "media" + sSep + "inf" + sSep + "syssetup.inf";
 
 	if ( 0 != InfHostOpenFile ( &inf, syssetupTemplate.c_str (), &errorLine ) )
 		throw new FileNotFoundException ( syssetupTemplate );