diff --git a/reactos/tools/Makefile b/reactos/tools/Makefile
index 9fcf18a4594..e2c1dd89bbf 100644
--- a/reactos/tools/Makefile
+++ b/reactos/tools/Makefile
@@ -20,7 +20,7 @@ TOOLS = \
 CLEAN_FILES = $(TOOLS)
 
 all: $(TOOLS) zlib_target wmc_target cabman_target cdmake_target mkhive_target rgenstat_target \
-	wine2ros_target pipetools_target winebuild_target bin2res_target
+	wine2ros_target pipetools_target rbuild_target winebuild_target bin2res_target
 
 buildno$(EXE_POSTFIX): buildno.c ../include/reactos/version.h
 	@$(HOST_CC) $(CFLAGS) -o buildno$(EXE_POSTFIX) buildno.c
@@ -124,13 +124,16 @@ ifeq ($(HOST),mingw32-windows)
 	$(MAKE) --silent -C pipetools
 endif
 
+rbuild_target:
+	$(MAKE) --silent -C rbuild rbuild$(EXE_POSTFIX)
+
 winebuild_target:
 	$(MAKE) --silent -C winebuild winebuild$(EXE_POSTFIX)
 
 bin2res_target:
 	$(MAKE) --silent -C bin2res bin2res$(EXE_POSTFIX)
 
-.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target
+.PHONY: wmc_target cdmake_target mkhive_target rgenstat_target pipetools_target rbuild_target
 
 
 ifeq ($(HOST),mingw32-linux)
@@ -141,6 +144,7 @@ clean:
 	$(MAKE) --silent -C wmc clean
 	$(MAKE) --silent -C rgenstat clean
 	$(MAKE) --silent -C wine2ros clean
+	$(MAKE) --silent -C rbuild clean
 	$(MAKE) --silent -C winebuild clean
 	$(MAKE) --silent -C bin2res clean
 	$(MAKE) --silent -C ../lib/zlib -f Makefile.host clean
@@ -156,6 +160,7 @@ clean:
 	$(MAKE) --silent -C wmc clean
 	$(MAKE) --silent -C rgenstat clean
 	$(MAKE) --silent -C pipetools clean
+	$(MAKE) --silent -C rbuild clean
 	$(MAKE) --silent -C wine2ros clean
 	$(MAKE) --silent -C winebuild clean
 	$(MAKE) --silent -C bin2res clean
diff --git a/reactos/tools/rbuild/makefile b/reactos/tools/rbuild/makefile
new file mode 100644
index 00000000000..818e6ac5838
--- /dev/null
+++ b/reactos/tools/rbuild/makefile
@@ -0,0 +1,35 @@
+PATH_TO_TOP = ../..
+
+TARGET = rbuild$(EXE_POSTFIX)
+
+all: $(TARGET)
+
+OBJECTS = rbuild.o
+
+CLEAN_FILES = *.o rbuild$(EXE_POSTFIX)
+
+HOST_CFLAGS = -g -I. -Werror -Wall
+
+HOST_LFLAGS = -g
+
+rbuild$(EXE_POSTFIX): $(OBJECTS)
+	$(HOST_CXX) $(OBJECTS) $(HOST_LFLAGS) -o rbuild$(EXE_POSTFIX)
+
+ifeq ($(HOST),mingw32-linux)
+clean:
+	-rm -f *.o
+	-rm -f rbuild$(EXE_POSTFIX)
+endif
+ifeq ($(HOST),mingw32-windows)
+clean:
+	-del *.o
+	-del rbuild$(EXE_POSTFIX)
+endif
+
+.phony: clean
+
+%.o: %.cpp
+	$(HALFVERBOSEECHO) [CXX]     $<
+	$(HOST_CXX) $(HOST_CFLAGS) -c $< -o $@
+
+include $(PATH_TO_TOP)/rules.mak
diff --git a/reactos/tools/rbuild/rbuild.cpp b/reactos/tools/rbuild/rbuild.cpp
index 7e5b2321015..cd90bc19e67 100644
--- a/reactos/tools/rbuild/rbuild.cpp
+++ b/reactos/tools/rbuild/rbuild.cpp
@@ -311,8 +311,10 @@ int main ( int argc, char** argv )
 	}
 
 	XMLElement* head = XMLParse ( f );
-
-	// REM TODO FIXME actually do something with the parsed info
+  if (head)
+  {
+	  // REM TODO FIXME actually do something with the parsed info
+  }
 
 	return 0;
 }