diff --git a/rosapps/dflat32/dflat32.xml b/rosapps/dflat32/dflat32.rbuild
similarity index 100%
rename from rosapps/dflat32/dflat32.xml
rename to rosapps/dflat32/dflat32.rbuild
diff --git a/rosapps/directory.rbuild b/rosapps/directory.rbuild
index f5b374310e2..d6596163b6a 100644
--- a/rosapps/directory.rbuild
+++ b/rosapps/directory.rbuild
@@ -11,41 +11,41 @@
 </directory>
 
 <directory name="dflat32">
-	<xi:include href="dflat32/dflat32.xml" />
+	<xi:include href="dflat32/dflat32.rbuild" />
 </directory>
 <!--
 <directory name="lib">
-	<xi:include href="lib/directory.xml" />
+	<xi:include href="lib/directory.rbuild" />
 </directory>
 -->
 <directory name="mc">
-	<xi:include href="mc/mc.xml" />
+	<xi:include href="mc/mc.rbuild" />
 </directory>
 
 <directory name="net">
-	<xi:include href="net/directory.xml" />
+	<xi:include href="net/directory.rbuild" />
 </directory>
 
 <directory name="notevil">
-	<xi:include href="notevil/notevil.xml" />
+	<xi:include href="notevil/notevil.rbuild" />
 </directory>
 
 <directory name="packmgr">
-	<xi:include href="packmgr/directory.xml" />
+	<xi:include href="packmgr/directory.rbuild" />
 </directory>
 
 <directory name="sysutils">
-	<xi:include href="sysutils/sysutils.xml" />
+	<xi:include href="sysutils/sysutils.rbuild" />
 </directory>
 
 <directory name="templates">
-	<xi:include href="templates/directory.xml" />
+	<xi:include href="templates/directory.rbuild" />
 </directory>
 <directory name="tests">
-	<xi:include href="tests/directory.xml" />
+	<xi:include href="tests/directory.rbuild" />
 </directory>
-<!--
+
 <directory name="welcome">
-	<xi:include href="welcome/welcome.xml" />
+	<xi:include href="welcome/welcome.rbuild" />
 </directory>
--->
+
diff --git a/rosapps/lib/dflat32/dflat32.xml b/rosapps/lib/dflat32/dflat32.rbuild
similarity index 100%
rename from rosapps/lib/dflat32/dflat32.xml
rename to rosapps/lib/dflat32/dflat32.rbuild
diff --git a/rosapps/lib/directory.rbuild b/rosapps/lib/directory.rbuild
new file mode 100644
index 00000000000..2fde578dced
--- /dev/null
+++ b/rosapps/lib/directory.rbuild
@@ -0,0 +1,3 @@
+<directory name="dflat32">
+	<xi:include href="dflat32/dflat32.rbuild" />
+</directory>
\ No newline at end of file
diff --git a/rosapps/lib/directory.xml b/rosapps/lib/directory.xml
deleted file mode 100644
index 22393853f3d..00000000000
--- a/rosapps/lib/directory.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<directory name="dflat32">
-	<xi:include href="dflat32/dflat32.xml" />
-</directory>
\ No newline at end of file
diff --git a/rosapps/mc/mc.xml b/rosapps/mc/mc.rbuild
similarity index 100%
rename from rosapps/mc/mc.xml
rename to rosapps/mc/mc.rbuild
diff --git a/rosapps/net/directory.rbuild b/rosapps/net/directory.rbuild
new file mode 100644
index 00000000000..37796300ae2
--- /dev/null
+++ b/rosapps/net/directory.rbuild
@@ -0,0 +1,12 @@
+<directory name="ncftp">
+	<xi:include href="ncftp/ncftp.rbuild" />
+</directory>
+
+<directory name="netreg">
+	<xi:include href="netreg/netreg.rbuild" />
+</directory>
+
+<directory name="niclist">
+	<xi:include href="niclist/niclist.rbuild" />
+</directory>
+
diff --git a/rosapps/net/directory.xml b/rosapps/net/directory.xml
deleted file mode 100644
index 5d53403bcbc..00000000000
--- a/rosapps/net/directory.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<directory name="ncftp">
-	<xi:include href="ncftp/ncftp.xml" />
-</directory>
-
-<directory name="netreg">
-	<xi:include href="netreg/netreg.xml" />
-</directory>
-
-<directory name="niclist">
-	<xi:include href="niclist/niclist.xml" />
-</directory>
-
diff --git a/rosapps/net/ncftp/ncftp.xml b/rosapps/net/ncftp/ncftp.rbuild
similarity index 100%
rename from rosapps/net/ncftp/ncftp.xml
rename to rosapps/net/ncftp/ncftp.rbuild
diff --git a/rosapps/net/netreg/netreg.xml b/rosapps/net/netreg/netreg.rbuild
similarity index 100%
rename from rosapps/net/netreg/netreg.xml
rename to rosapps/net/netreg/netreg.rbuild
diff --git a/rosapps/net/niclist/niclist.xml b/rosapps/net/niclist/niclist.rbuild
similarity index 100%
rename from rosapps/net/niclist/niclist.xml
rename to rosapps/net/niclist/niclist.rbuild
diff --git a/rosapps/notevil/notevil.xml b/rosapps/notevil/notevil.rbuild
similarity index 100%
rename from rosapps/notevil/notevil.xml
rename to rosapps/notevil/notevil.rbuild
diff --git a/rosapps/packmgr/cmd-line/rosget.xml b/rosapps/packmgr/cmd-line/rosget.rbuild
similarity index 100%
rename from rosapps/packmgr/cmd-line/rosget.xml
rename to rosapps/packmgr/cmd-line/rosget.rbuild
diff --git a/rosapps/packmgr/directory.rbuild b/rosapps/packmgr/directory.rbuild
new file mode 100644
index 00000000000..333b3d3aa9d
--- /dev/null
+++ b/rosapps/packmgr/directory.rbuild
@@ -0,0 +1,9 @@
+<directory name="cmd-line">
+	<xi:include href="cmd-line/rosget.rbuild" />
+</directory>
+<directory name="gui">
+	<xi:include href="gui/packmgr.rbuild" />
+</directory>
+<directory name="lib">
+	<xi:include href="lib/package.rbuild" />
+</directory>
\ No newline at end of file
diff --git a/rosapps/packmgr/directory.xml b/rosapps/packmgr/directory.xml
deleted file mode 100644
index 543fba31a28..00000000000
--- a/rosapps/packmgr/directory.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<directory name="cmd-line">
-	<xi:include href="cmd-line/rosget.xml" />
-</directory>
-<directory name="gui">
-	<xi:include href="gui/packmgr.xml" />
-</directory>
-<directory name="lib">
-	<xi:include href="lib/package.xml" />
-</directory>
\ No newline at end of file
diff --git a/rosapps/packmgr/gui/packmgr.xml b/rosapps/packmgr/gui/packmgr.rbuild
similarity index 100%
rename from rosapps/packmgr/gui/packmgr.xml
rename to rosapps/packmgr/gui/packmgr.rbuild
diff --git a/rosapps/packmgr/lib/package.xml b/rosapps/packmgr/lib/package.rbuild
similarity index 100%
rename from rosapps/packmgr/lib/package.xml
rename to rosapps/packmgr/lib/package.rbuild
diff --git a/rosapps/sysutils/chkdsk/chkdsk.xml b/rosapps/sysutils/chkdsk/chkdsk.rbuild
similarity index 100%
rename from rosapps/sysutils/chkdsk/chkdsk.xml
rename to rosapps/sysutils/chkdsk/chkdsk.rbuild
diff --git a/rosapps/sysutils/chklib/chklib.xml b/rosapps/sysutils/chklib/chklib.rbuild
similarity index 100%
rename from rosapps/sysutils/chklib/chklib.xml
rename to rosapps/sysutils/chklib/chklib.rbuild
diff --git a/rosapps/sysutils/ctm/ctm.xml b/rosapps/sysutils/ctm/ctm.rbuild
similarity index 100%
rename from rosapps/sysutils/ctm/ctm.xml
rename to rosapps/sysutils/ctm/ctm.rbuild
diff --git a/rosapps/sysutils/kill/kill.xml b/rosapps/sysutils/kill/kill.rbuild
similarity index 100%
rename from rosapps/sysutils/kill/kill.xml
rename to rosapps/sysutils/kill/kill.rbuild
diff --git a/rosapps/sysutils/lib/lib.xml b/rosapps/sysutils/lib/lib.rbuild
similarity index 100%
rename from rosapps/sysutils/lib/lib.xml
rename to rosapps/sysutils/lib/lib.rbuild
diff --git a/rosapps/sysutils/lsdd/lsdd.xml b/rosapps/sysutils/lsdd/lsdd.rbuild
similarity index 100%
rename from rosapps/sysutils/lsdd/lsdd.xml
rename to rosapps/sysutils/lsdd/lsdd.rbuild
diff --git a/rosapps/sysutils/man/man.xml b/rosapps/sysutils/man/man.rbuild
similarity index 100%
rename from rosapps/sysutils/man/man.xml
rename to rosapps/sysutils/man/man.rbuild
diff --git a/rosapps/sysutils/pedump/pedump.xml b/rosapps/sysutils/pedump/pedump.rbuild
similarity index 100%
rename from rosapps/sysutils/pedump/pedump.xml
rename to rosapps/sysutils/pedump/pedump.rbuild
diff --git a/rosapps/sysutils/regexpl/regexpl.xml b/rosapps/sysutils/regexpl/regexpl.rbuild
similarity index 100%
rename from rosapps/sysutils/regexpl/regexpl.xml
rename to rosapps/sysutils/regexpl/regexpl.rbuild
diff --git a/rosapps/sysutils/sysutils.rbuild b/rosapps/sysutils/sysutils.rbuild
new file mode 100644
index 00000000000..4a6ca80355b
--- /dev/null
+++ b/rosapps/sysutils/sysutils.rbuild
@@ -0,0 +1,40 @@
+<directory name="lib">
+	<xi:include href="lib/lib.rbuild" />
+</directory>
+
+<directory name="ctm">
+	<xi:include href="ctm/ctm.rbuild" />
+</directory>
+<!--
+<directory name="chkdsk">
+	<xi:include href="chkdsk/chkdsk.rbuild" />
+</directory>
+-->
+
+<directory name="kill">
+	<xi:include href="kill/kill.rbuild" />
+</directory>
+
+<directory name="lsdd">
+	<xi:include href="lsdd/lsdd.rbuild" />
+</directory>
+
+<directory name="man">
+	<xi:include href="man/man.rbuild" />
+</directory>
+
+<directory name="pedump">
+	<xi:include href="pedump/pedump.rbuild" />
+</directory>
+
+<directory name="regexpl">
+	<xi:include href="regexpl/regexpl.rbuild" />
+</directory>
+
+<directory name="tcat">
+	<xi:include href="tcat/cat.rbuild" />
+</directory>
+
+<directory name="tlist">
+	<xi:include href="tlist/tlist.rbuild" />
+</directory>
diff --git a/rosapps/sysutils/sysutils.xml b/rosapps/sysutils/sysutils.xml
deleted file mode 100644
index 085cef200b9..00000000000
--- a/rosapps/sysutils/sysutils.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<directory name="lib">
-	<xi:include href="lib/lib.xml" />
-</directory>
-
-<directory name="ctm">
-	<xi:include href="ctm/ctm.xml" />
-</directory>
-<!--
-<directory name="chkdsk">
-	<xi:include href="chkdsk/chkdsk.xml" />
-</directory>
--->
-
-<directory name="kill">
-	<xi:include href="kill/kill.xml" />
-</directory>
-
-<directory name="lsdd">
-	<xi:include href="lsdd/lsdd.xml" />
-</directory>
-
-<directory name="man">
-	<xi:include href="man/man.xml" />
-</directory>
-
-<directory name="pedump">
-	<xi:include href="pedump/pedump.xml" />
-</directory>
-
-<directory name="regexpl">
-	<xi:include href="regexpl/regexpl.xml" />
-</directory>
-
-<directory name="tcat">
-	<xi:include href="tcat/cat.xml" />
-</directory>
-
-<directory name="tlist">
-	<xi:include href="tlist/tlist.xml" />
-</directory>
diff --git a/rosapps/sysutils/tcat/cat.xml b/rosapps/sysutils/tcat/cat.rbuild
similarity index 100%
rename from rosapps/sysutils/tcat/cat.xml
rename to rosapps/sysutils/tcat/cat.rbuild
diff --git a/rosapps/sysutils/tlist/tlist.xml b/rosapps/sysutils/tlist/tlist.rbuild
similarity index 100%
rename from rosapps/sysutils/tlist/tlist.xml
rename to rosapps/sysutils/tlist/tlist.rbuild
diff --git a/rosapps/templates/directory.xml b/rosapps/templates/directory.rbuild
similarity index 100%
rename from rosapps/templates/directory.xml
rename to rosapps/templates/directory.rbuild
diff --git a/rosapps/tests/directory.xml b/rosapps/tests/directory.rbuild
similarity index 100%
rename from rosapps/tests/directory.xml
rename to rosapps/tests/directory.rbuild
diff --git a/rosapps/welcome/welcome.xml b/rosapps/welcome/welcome.rbuild
similarity index 96%
rename from rosapps/welcome/welcome.xml
rename to rosapps/welcome/welcome.rbuild
index bd51e439888..dfd2abc8096 100644
--- a/rosapps/welcome/welcome.xml
+++ b/rosapps/welcome/welcome.rbuild
@@ -19,5 +19,5 @@
 	<library>user32</library>
 	<library>gdi32</library>
 	<file>welcome.c</file>
-	<file>autorun.rc</file>
+	<file>welcome.rc</file>
 </module>