diff --git a/reactos/Makefile b/reactos/Makefile
index b4c5859ed9d..184d3176fc2 100644
--- a/reactos/Makefile
+++ b/reactos/Makefile
@@ -418,6 +418,7 @@ $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES)
 	${mkdir} $(INTERMEDIATE_)media$(SEP)inf 2>$(NUL)
 	$(ECHO_RBUILD)
 	$(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -rReactOS-$(ARCH).rbuild mingw
+	@$(MAKE) psdk
 
 world: all bootcd livecd
 
diff --git a/reactos/ReactOS-i386.rbuild b/reactos/ReactOS-i386.rbuild
index c5ca32207ca..cfc121f1855 100644
--- a/reactos/ReactOS-i386.rbuild
+++ b/reactos/ReactOS-i386.rbuild
@@ -57,6 +57,7 @@
 
   <include>.</include>
   <include>include</include>
+  <include root="intermediate">include</include>
   <include>include/psdk</include>
   <include root="intermediate">include/psdk</include>
   <include>include/dxsdk</include>