diff --git a/rosapps/cmdutils/cmdutils.rbuild b/rosapps/cmdutils/cmdutils.rbuild
new file mode 100644
index 00000000000..5007a13a831
--- /dev/null
+++ b/rosapps/cmdutils/cmdutils.rbuild
@@ -0,0 +1,20 @@
+<group>
+<directory name="comp">
+    <xi:include href="comp/comp.rbuild" />
+</directory>
+<directory name="mode">
+    <xi:include href="mode/mode.rbuild" />
+</directory>
+<directory name="sort">
+    <xi:include href="sort/sort.rbuild" />
+</directory>
+<directory name="tee">
+    <xi:include href="tee/tee.rbuild" />
+</directory>
+<directory name="touch">
+    <xi:include href="touch/touch.rbuild" />
+</directory>
+<directory name="y">
+    <xi:include href="y/y.rbuild" />
+</directory>
+</group>
diff --git a/rosapps/cmdutils/cmdutils.xml b/rosapps/cmdutils/cmdutils.xml
deleted file mode 100644
index d5968e237b3..00000000000
--- a/rosapps/cmdutils/cmdutils.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<group>
-<directory name="comp">
-    <xi:include href="comp/comp.xml" />
-</directory>
-<directory name="mode">
-    <xi:include href="mode/mode.xml" />
-</directory>
-<directory name="sort">
-    <xi:include href="sort/sort.xml" />
-</directory>
-<directory name="tee">
-    <xi:include href="tee/tee.xml" />
-</directory>
-<directory name="touch">
-    <xi:include href="touch/touch.xml" />
-</directory>
-<directory name="y">
-    <xi:include href="y/y.xml" />
-</directory>
-</group>
diff --git a/rosapps/cmdutils/comp/comp.xml b/rosapps/cmdutils/comp/comp.rbuild
similarity index 100%
rename from rosapps/cmdutils/comp/comp.xml
rename to rosapps/cmdutils/comp/comp.rbuild
diff --git a/rosapps/cmdutils/mode/mode.xml b/rosapps/cmdutils/mode/mode.rbuild
similarity index 100%
rename from rosapps/cmdutils/mode/mode.xml
rename to rosapps/cmdutils/mode/mode.rbuild
diff --git a/rosapps/cmdutils/sort/sort.xml b/rosapps/cmdutils/sort/sort.rbuild
similarity index 100%
rename from rosapps/cmdutils/sort/sort.xml
rename to rosapps/cmdutils/sort/sort.rbuild
diff --git a/rosapps/cmdutils/tee/tee.xml b/rosapps/cmdutils/tee/tee.rbuild
similarity index 100%
rename from rosapps/cmdutils/tee/tee.xml
rename to rosapps/cmdutils/tee/tee.rbuild
diff --git a/rosapps/cmdutils/touch/touch.xml b/rosapps/cmdutils/touch/touch.rbuild
similarity index 100%
rename from rosapps/cmdutils/touch/touch.xml
rename to rosapps/cmdutils/touch/touch.rbuild
diff --git a/rosapps/cmdutils/y/y.xml b/rosapps/cmdutils/y/y.rbuild
similarity index 100%
rename from rosapps/cmdutils/y/y.xml
rename to rosapps/cmdutils/y/y.rbuild
diff --git a/rosapps/demos/ddraw/ddraw.xml b/rosapps/demos/ddraw/ddraw.rbuild
similarity index 100%
rename from rosapps/demos/ddraw/ddraw.xml
rename to rosapps/demos/ddraw/ddraw.rbuild
diff --git a/rosapps/demos/directory.rbuild b/rosapps/demos/directory.rbuild
new file mode 100644
index 00000000000..f9911d05c01
--- /dev/null
+++ b/rosapps/demos/directory.rbuild
@@ -0,0 +1,7 @@
+<directory name="maze">
+	<xi:include href="maze/maze.rbuild" />
+</directory>
+
+<directory name="ddraw">
+	<xi:include href="ddraw/ddraw.rbuild" />
+</directory>
diff --git a/rosapps/demos/directory.xml b/rosapps/demos/directory.xml
deleted file mode 100644
index fb38c4338eb..00000000000
--- a/rosapps/demos/directory.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<directory name="maze">
-	<xi:include href="maze/maze.xml" />
-</directory>
-
-<directory name="ddraw">
-	<xi:include href="ddraw/ddraw.xml" />
-</directory>
diff --git a/rosapps/demos/maze/maze.xml b/rosapps/demos/maze/maze.rbuild
similarity index 100%
rename from rosapps/demos/maze/maze.xml
rename to rosapps/demos/maze/maze.rbuild
diff --git a/rosapps/devutils/directory.rbuild b/rosapps/devutils/directory.rbuild
new file mode 100644
index 00000000000..e96f8f60d66
--- /dev/null
+++ b/rosapps/devutils/directory.rbuild
@@ -0,0 +1,11 @@
+<directory name="gdb2">
+	<xi:include href="gdb2/gdb2.rbuild" />
+</directory>
+
+<directory name="genguid">
+	<xi:include href="genguid/genguid.rbuild" />
+</directory>
+
+<directory name="zoomin">
+	<xi:include href="zoomin/zoomin.rbuild" />
+</directory>
diff --git a/rosapps/devutils/directory.xml b/rosapps/devutils/directory.xml
deleted file mode 100644
index 4cd57532ef6..00000000000
--- a/rosapps/devutils/directory.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<directory name="gdb2">
-	<xi:include href="gdb2/gdb2.xml" />
-</directory>
-
-<directory name="genguid">
-	<xi:include href="genguid/genguid.xml" />
-</directory>
-
-<directory name="zoomin">
-	<xi:include href="zoomin/zoomin.xml" />
-</directory>
diff --git a/rosapps/devutils/gdb2/gdb2.xml b/rosapps/devutils/gdb2/gdb2.rbuild
similarity index 100%
rename from rosapps/devutils/gdb2/gdb2.xml
rename to rosapps/devutils/gdb2/gdb2.rbuild
diff --git a/rosapps/devutils/genguid/genguid.xml b/rosapps/devutils/genguid/genguid.rbuild
similarity index 100%
rename from rosapps/devutils/genguid/genguid.xml
rename to rosapps/devutils/genguid/genguid.rbuild
diff --git a/rosapps/devutils/zoomin/zoomin.xml b/rosapps/devutils/zoomin/zoomin.rbuild
similarity index 100%
rename from rosapps/devutils/zoomin/zoomin.xml
rename to rosapps/devutils/zoomin/zoomin.rbuild
diff --git a/rosapps/directory.rbuild b/rosapps/directory.rbuild
index 81482bf21ba..f5b374310e2 100644
--- a/rosapps/directory.rbuild
+++ b/rosapps/directory.rbuild
@@ -1,13 +1,13 @@
 <directory name="cmdutils">
-	<xi:include href="cmdutils/cmdutils.xml" />
+	<xi:include href="cmdutils/cmdutils.rbuild" />
 </directory>
 
 <directory name="demos">
-	<xi:include href="demos/directory.xml" />
+	<xi:include href="demos/directory.rbuild" />
 </directory>
 
 <directory name="devutils">
-	<xi:include href="devutils/directory.xml" />
+	<xi:include href="devutils/directory.rbuild" />
 </directory>
 
 <directory name="dflat32">