diff --git a/reactos/base/services/services.rbuild b/reactos/base/services/services.rbuild
index 890176ac9b9..114776f2676 100644
--- a/reactos/base/services/services.rbuild
+++ b/reactos/base/services/services.rbuild
@@ -1,22 +1,22 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-<directory name="audiosrv">
-	<xi:include href="audiosrv/audiosrv.rbuild" />
-</directory>
-<directory name="dhcp">
-	<xi:include href="dhcp/dhcp.rbuild" />
-</directory>
-<directory name="eventlog">
-	<xi:include href="eventlog/eventlog.rbuild" />
-</directory>
-<directory name="rpcss">
-	<xi:include href="rpcss/rpcss.rbuild" />
-</directory>
-<directory name="tcpsvcs">
-	<xi:include href="tcpsvcs/tcpsvcs.rbuild" />
-</directory>
-<directory name="umpnpmgr">
-	<xi:include href="umpnpmgr/umpnpmgr.rbuild" />
-</directory>
+	<directory name="audiosrv">
+		<xi:include href="audiosrv/audiosrv.rbuild" />
+	</directory>
+	<directory name="dhcp">
+		<xi:include href="dhcp/dhcp.rbuild" />
+	</directory>
+	<directory name="eventlog">
+		<xi:include href="eventlog/eventlog.rbuild" />
+	</directory>
+	<directory name="rpcss">
+		<xi:include href="rpcss/rpcss.rbuild" />
+	</directory>
+	<directory name="tcpsvcs">
+		<xi:include href="tcpsvcs/tcpsvcs.rbuild" />
+	</directory>
+	<directory name="umpnpmgr">
+		<xi:include href="umpnpmgr/umpnpmgr.rbuild" />
+	</directory>
 </group>
diff --git a/reactos/base/setup/reactos/reactos.rbuild b/reactos/base/setup/reactos/reactos.rbuild
index 1fa474396d0..9b98554a1d6 100644
--- a/reactos/base/setup/reactos/reactos.rbuild
+++ b/reactos/base/setup/reactos/reactos.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="reactos" type="win32gui">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="reactos">.</include>
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
diff --git a/reactos/base/setup/usetup/usetup.rbuild b/reactos/base/setup/usetup/usetup.rbuild
index 84284201d64..edeaaaef2ef 100644
--- a/reactos/base/setup/usetup/usetup.rbuild
+++ b/reactos/base/setup/usetup/usetup.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" allowwarnings="false">
-	<bootstrap base="$(CDOUTPUT)/system32" nameoncd="smss.exe" />
+	<bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="smss.exe" />
 	<include base="usetup">.</include>
 	<include base="zlib">.</include>
 	<include base="inflib">.</include>
diff --git a/reactos/base/setup/welcome/welcome.rbuild b/reactos/base/setup/welcome/welcome.rbuild
index 96ef6c557ac..1c1b3feeddb 100644
--- a/reactos/base/setup/welcome/welcome.rbuild
+++ b/reactos/base/setup/welcome/welcome.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="welcome">.</include>
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
diff --git a/reactos/base/shell/explorer/explorer.rbuild b/reactos/base/shell/explorer/explorer.rbuild
index 111ec2518c9..42ff9df6c4b 100644
--- a/reactos/base/shell/explorer/explorer.rbuild
+++ b/reactos/base/shell/explorer/explorer.rbuild
@@ -70,7 +70,7 @@
 	<file>i386-stub-win32.c</file>
 	<file>explorer.rc</file>
 </module>
-<installfile base=".">explorer-cfg-template.xml</installfile>
+<installfile installbase=".">explorer-cfg-template.xml</installfile>
 <directory name="notifyhook">
 	<xi:include href="notifyhook/notifyhook.rbuild" />
 </directory>
diff --git a/reactos/boot/bootdata/bootdata.rbuild b/reactos/boot/bootdata/bootdata.rbuild
index 02c554d7d23..db1da783ea8 100644
--- a/reactos/boot/bootdata/bootdata.rbuild
+++ b/reactos/boot/bootdata/bootdata.rbuild
@@ -4,12 +4,12 @@
 	<cdfile>autorun.inf</cdfile>
 	<cdfile>icon.ico</cdfile>
 	<cdfile>readme.txt</cdfile>
-	<cdfile base="$(CDOUTPUT)">hivecls.inf</cdfile>
-	<cdfile base="$(CDOUTPUT)">hivedef.inf</cdfile>
-	<cdfile base="$(CDOUTPUT)">hivesft.inf</cdfile>
-	<cdfile base="$(CDOUTPUT)">hivesys.inf</cdfile>
-	<cdfile base="$(CDOUTPUT)">txtsetup.sif</cdfile>
-	<cdfile base="$(CDOUTPUT)">unattend.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile>
 	<directory name="bootcd">
 		<xi:include href="bootcd/bootcd.rbuild" />
 	</directory>
diff --git a/reactos/boot/freeldr/bootsect/bootsect.rbuild b/reactos/boot/freeldr/bootsect/bootsect.rbuild
index b2b6d8baf52..0a6be4b63be 100644
--- a/reactos/boot/freeldr/bootsect/bootsect.rbuild
+++ b/reactos/boot/freeldr/bootsect/bootsect.rbuild
@@ -2,27 +2,27 @@
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="dosmbr" type="bootsector" >
-	<bootstrap base="loader" nameoncd="dosmbr.bin" />
+	<bootstrap installbase="loader" nameoncd="dosmbr.bin" />
 	<file>dosmbr.asm</file>
 </module>
 <module name="ext2" type="bootsector">
-	<bootstrap base="loader" nameoncd="ext2.bin" />
+	<bootstrap installbase="loader" nameoncd="ext2.bin" />
 	<file>ext2.asm</file>
 </module>
 <module name="fat32" type="bootsector">
-	<bootstrap base="loader" nameoncd="fat32.bin" />
+	<bootstrap installbase="loader" nameoncd="fat32.bin" />
 	<file>fat32.asm</file>
 </module>
 <module name="fat" type="bootsector">
-	<bootstrap base="loader" nameoncd="fat.bin" />
+	<bootstrap installbase="loader" nameoncd="fat.bin" />
 	<file>fat.asm</file>
 </module>
 <module name="isoboot" type="bootsector">
-	<bootstrap base="loader" nameoncd="isoboot.bin" />
+	<bootstrap installbase="loader" nameoncd="isoboot.bin" />
 	<file>isoboot.asm</file>
 </module>
 <module name="isobtrt" type="bootsector">
-	<bootstrap base="loader" nameoncd="isobtrt.bin" />
+	<bootstrap installbase="loader" nameoncd="isobtrt.bin" />
 	<file>isobtrt.asm</file>
 </module>
 </group>
diff --git a/reactos/boot/freeldr/freeldr/freeldr.rbuild b/reactos/boot/freeldr/freeldr/freeldr.rbuild
index f91e64c06a0..5e129deeae9 100644
--- a/reactos/boot/freeldr/freeldr/freeldr.rbuild
+++ b/reactos/boot/freeldr/freeldr/freeldr.rbuild
@@ -3,7 +3,7 @@
 <group>
 	<if property="ARCH" value="i386">
 		<module name="freeldr" type="bootloader">
-			<bootstrap base="loader" />
+			<bootstrap installbase="loader" />
 			<library>freeldr_startup</library>
 			<library>freeldr_base64k</library>
 			<library>freeldr_base</library>
diff --git a/reactos/boot/freeldr/freeldr/setupldr.rbuild b/reactos/boot/freeldr/freeldr/setupldr.rbuild
index 727291b493f..2a2fd72747c 100644
--- a/reactos/boot/freeldr/freeldr/setupldr.rbuild
+++ b/reactos/boot/freeldr/freeldr/setupldr.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="setupldr" type="bootloader">
-	<bootstrap base="loader" />
+	<bootstrap installbase="loader" />
 	<library>freeldr_startup</library>
 	<library>freeldr_base64k</library>
 	<library>freeldr_base</library>
diff --git a/reactos/dll/ntdll/ntdll.rbuild b/reactos/dll/ntdll/ntdll.rbuild
index ab834461bb6..9a464b60e10 100644
--- a/reactos/dll/ntdll/ntdll.rbuild
+++ b/reactos/dll/ntdll/ntdll.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd">
 <module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll">
-	<bootstrap base="$(CDOUTPUT)/system32" />
+	<bootstrap installbase="$(CDOUTPUT)/system32" />
 	<importlibrary definition="def/ntdll.def" />
 	<include base="ntdll">inc</include>
 	<include base="ReactOS">include/reactos/subsys</include>
diff --git a/reactos/drivers/base/bootvid/bootvid.rbuild b/reactos/drivers/base/bootvid/bootvid.rbuild
index 7a1fc41be15..82d119a308f 100644
--- a/reactos/drivers/base/bootvid/bootvid.rbuild
+++ b/reactos/drivers/base/bootvid/bootvid.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll">
 	<importlibrary definition="bootvid.def"></importlibrary>
-	<bootstrap base="$(CDOUTPUT)" nameoncd="bootvid.dll" />
+	<bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" />
 	<include base="bootvid">.</include>
 	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/base/kdcom/kdcom.rbuild b/reactos/drivers/base/kdcom/kdcom.rbuild
index a51f80233d0..b5fcf2f734d 100644
--- a/reactos/drivers/base/kdcom/kdcom.rbuild
+++ b/reactos/drivers/base/kdcom/kdcom.rbuild
@@ -1,11 +1,11 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll">
-	<importlibrary definition="kdcom.def"></importlibrary>
-	<bootstrap base="$(CDOUTPUT)" nameoncd="kdcom.dll" />
-	<include base="kdcom">.</include>
-	<define name="__USE_W32API" />
-	<library>ntoskrnl</library>
-	<library>hal</library>
-	<file>kdbg.c</file>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll">
+	<importlibrary definition="kdcom.def"></importlibrary>
+	<bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
+	<include base="kdcom">.</include>
+	<define name="__USE_W32API" />
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<file>kdbg.c</file>
+</module>
diff --git a/reactos/drivers/filesystems/cdfs/cdfs.rbuild b/reactos/drivers/filesystems/cdfs/cdfs.rbuild
index 9252a4e9e67..3afecd61cac 100644
--- a/reactos/drivers/filesystems/cdfs/cdfs.rbuild
+++ b/reactos/drivers/filesystems/cdfs/cdfs.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="cdfs">.</include>
 	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/filesystems/ntfs/ntfs.rbuild b/reactos/drivers/filesystems/ntfs/ntfs.rbuild
index 281a6f472ff..c058ddc4d13 100644
--- a/reactos/drivers/filesystems/ntfs/ntfs.rbuild
+++ b/reactos/drivers/filesystems/ntfs/ntfs.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="ntfs">.</include>
 	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/filesystems/vfat/vfatfs.rbuild b/reactos/drivers/filesystems/vfat/vfatfs.rbuild
index 05c01668211..f58f6f5337d 100644
--- a/reactos/drivers/filesystems/vfat/vfatfs.rbuild
+++ b/reactos/drivers/filesystems/vfat/vfatfs.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="vfatfs">.</include>
 	<define name="__USE_W32API" />
 	<linkerflag>-lgcc</linkerflag>
diff --git a/reactos/drivers/input/i8042prt/i8042prt.rbuild b/reactos/drivers/input/i8042prt/i8042prt.rbuild
index 8b0bf42fa9b..976734448d2 100644
--- a/reactos/drivers/input/i8042prt/i8042prt.rbuild
+++ b/reactos/drivers/input/i8042prt/i8042prt.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="i8042prt">.</include>
 	<define name="__USE_W32API" />
 	<define name="__REACTOS__" />
diff --git a/reactos/drivers/input/kbdclass/kbdclass.rbuild b/reactos/drivers/input/kbdclass/kbdclass.rbuild
index c017d4a44bb..75167b86b83 100644
--- a/reactos/drivers/input/kbdclass/kbdclass.rbuild
+++ b/reactos/drivers/input/kbdclass/kbdclass.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="__USE_W32API" />
 	<define name="NDEBUG" />
 	<library>pseh</library>
diff --git a/reactos/drivers/setup/blue/blue.rbuild b/reactos/drivers/setup/blue/blue.rbuild
index afced1b48cb..3aea91f2c86 100644
--- a/reactos/drivers/setup/blue/blue.rbuild
+++ b/reactos/drivers/setup/blue/blue.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="__USE_W32API" />
 	<include base="ReactOS">include/reactos/drivers</include>
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/storage/class/cdrom/cdrom.rbuild b/reactos/drivers/storage/class/cdrom/cdrom.rbuild
index 4269b04574d..1d1289df163 100644
--- a/reactos/drivers/storage/class/cdrom/cdrom.rbuild
+++ b/reactos/drivers/storage/class/cdrom/cdrom.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys" allowwarnings="true">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="__USE_W32API" />
 	<library>ntoskrnl</library>
 	<library>hal</library>
diff --git a/reactos/drivers/storage/class/class2/class2.rbuild b/reactos/drivers/storage/class/class2/class2.rbuild
index dc2b66c63c5..7cdfd852d91 100644
--- a/reactos/drivers/storage/class/class2/class2.rbuild
+++ b/reactos/drivers/storage/class/class2/class2.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="__USE_W32API" />
 	<importlibrary definition="class2.def" />
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/storage/class/disk/disk.rbuild b/reactos/drivers/storage/class/disk/disk.rbuild
index 9446cfe0bcc..59b6e9d9028 100644
--- a/reactos/drivers/storage/class/disk/disk.rbuild
+++ b/reactos/drivers/storage/class/disk/disk.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="__USE_W32API" />
 	<linkerflag>-lgcc</linkerflag>
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/storage/floppy/floppy.rbuild b/reactos/drivers/storage/floppy/floppy.rbuild
index 608904fcaff..72382c9dfb2 100644
--- a/reactos/drivers/storage/floppy/floppy.rbuild
+++ b/reactos/drivers/storage/floppy/floppy.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="__USE_W32API" />
 	<include base="floppy">.</include>
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/storage/ide/atapi/atapi.rbuild b/reactos/drivers/storage/ide/atapi/atapi.rbuild
index f4d2e17c0f3..eb9a875cea3 100644
--- a/reactos/drivers/storage/ide/atapi/atapi.rbuild
+++ b/reactos/drivers/storage/ide/atapi/atapi.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys" allowwarnings="true">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="__USE_W32API" />
 	<include base="atapi">.</include>
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/storage/ide/uniata/uniata.rbuild b/reactos/drivers/storage/ide/uniata/uniata.rbuild
index 07b4f0adcee..6ead4936e7e 100644
--- a/reactos/drivers/storage/ide/uniata/uniata.rbuild
+++ b/reactos/drivers/storage/ide/uniata/uniata.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="__USE_W32API" />
 	<define name="_DEBUG" />
 	<include base="uniata">.</include> 
diff --git a/reactos/drivers/storage/port/buslogic/buslogic.rbuild b/reactos/drivers/storage/port/buslogic/buslogic.rbuild
index 3a2e3f81868..dcaf55528aa 100644
--- a/reactos/drivers/storage/port/buslogic/buslogic.rbuild
+++ b/reactos/drivers/storage/port/buslogic/buslogic.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<define name="__USE_W32API" />
 	<include base="buslogic">.</include>
 	<library>ntoskrnl</library>
diff --git a/reactos/drivers/storage/port/diskdump/diskdump.rbuild b/reactos/drivers/storage/port/diskdump/diskdump.rbuild
index c60a677e393..504f26b51b0 100644
--- a/reactos/drivers/storage/port/diskdump/diskdump.rbuild
+++ b/reactos/drivers/storage/port/diskdump/diskdump.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd">
 <module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<importlibrary definition="diskdump.def" />
 	<define name="__USE_W32API" />
 	<include base="ReactOS">include/reactos/drivers</include>
diff --git a/reactos/drivers/storage/scsiport/scsiport.rbuild b/reactos/drivers/storage/scsiport/scsiport.rbuild
index 78337314138..0c6e5dbe4f7 100644
--- a/reactos/drivers/storage/scsiport/scsiport.rbuild
+++ b/reactos/drivers/storage/scsiport/scsiport.rbuild
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
-<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys">
-	<bootstrap base="$(CDOUTPUT)" />
-	<define name="__USE_W32API" />
-	<define name="_SCSIPORT_" />
-	<importlibrary definition="scsiport.def" />
-	<include base="scsiport">.</include>
-	<library>ntoskrnl</library>
-	<library>hal</library>
-	<file>scsiport.c</file>
-	<file>scsiport.rc</file>
-</module>
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys">
+	<bootstrap installbase="$(CDOUTPUT)" />
+	<define name="__USE_W32API" />
+	<define name="_SCSIPORT_" />
+	<importlibrary definition="scsiport.def" />
+	<include base="scsiport">.</include>
+	<library>ntoskrnl</library>
+	<library>hal</library>
+	<file>scsiport.c</file>
+	<file>scsiport.rc</file>
+</module>
diff --git a/reactos/hal/halppc/up/halup.rbuild b/reactos/hal/halppc/up/halup.rbuild
index 8e6801b9505..42d142f9f40 100644
--- a/reactos/hal/halppc/up/halup.rbuild
+++ b/reactos/hal/halppc/up/halup.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="halppc_up" type="kernelmodedll">
 	<importlibrary definition="../../hal/hal.def" />
-	<bootstrap base="reactos" nameoncd="hal.dll" />
+	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
 	<include base="halppc_generic">../include</include>
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/hal/halx86/mp/halmp.rbuild b/reactos/hal/halx86/mp/halmp.rbuild
index 7cb4670a5d3..a04c1461084 100644
--- a/reactos/hal/halx86/mp/halmp.rbuild
+++ b/reactos/hal/halx86/mp/halmp.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="halmp" type="kernelmodedll" entrypoint="0">
 	<importlibrary definition="../../hal/hal.def" />
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<include base="hal_generic">../include</include>
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/hal/halx86/up/halup.rbuild b/reactos/hal/halx86/up/halup.rbuild
index c26445928fd..1a440f3fbba 100644
--- a/reactos/hal/halx86/up/halup.rbuild
+++ b/reactos/hal/halx86/up/halup.rbuild
@@ -2,7 +2,7 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="halup" type="kernelmodedll" entrypoint="0">
 	<importlibrary definition="../../hal/hal.def" />
-	<bootstrap base="$(CDOUTPUT)" nameoncd="hal.dll" />
+	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
 	<include base="hal_generic">../include</include>
 	<include base="ntoskrnl">include</include>
 	<define name="_DISABLE_TIDENTS" />
diff --git a/reactos/media/drivers/etc/etc.rbuild b/reactos/media/drivers/etc/etc.rbuild
index 9e70afb8682..5302cc6ccd0 100644
--- a/reactos/media/drivers/etc/etc.rbuild
+++ b/reactos/media/drivers/etc/etc.rbuild
@@ -1,10 +1,10 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
-	<cdfile base="$(CDOUTPUT)">services</cdfile>
-	<installfile base="system32/drivers/etc">services</installfile>
+	<cdfile installbase="$(CDOUTPUT)">services</cdfile>
+	<installfile installbase="system32/drivers/etc">services</installfile>
 	<if property="KDBG" value="1">
-		<cdfile base="$(CDOUTPUT)">KDBinit</cdfile>
-		<installfile base="system32/drivers/etc">KDBinit</installfile>
+		<cdfile installbase="$(CDOUTPUT)">KDBinit</cdfile>
+		<installfile installbase="system32/drivers/etc">KDBinit</installfile>
 	</if>
 </group>
diff --git a/reactos/media/fonts/fonts.rbuild b/reactos/media/fonts/fonts.rbuild
index b112f660f33..79535bdb63d 100644
--- a/reactos/media/fonts/fonts.rbuild
+++ b/reactos/media/fonts/fonts.rbuild
@@ -1,55 +1,55 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-<installfile base="media/fonts">DejaVuSans-Bold.ttf </installfile>
-<installfile base="media/fonts">DejaVuSans.ttf</installfile>
-<installfile base="media/fonts">DejaVuSans-BoldOblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansCondensed.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSans-ExtraLight.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansMono.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansMono-Bold.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSansMono-Oblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSans-Oblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerif.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerif-Bold.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerif-Italic.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile>
-<installfile base="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile>
-<installfile base="media/fonts">c0419bt_.ttf</installfile>
-<installfile base="media/fonts">c0582bt_.ttf</installfile>
-<installfile base="media/fonts">c0583bt_.ttf</installfile>
-<installfile base="media/fonts">c0611bt_.ttf</installfile>
-<installfile base="media/fonts">c0632bt_.ttf</installfile>
-<installfile base="media/fonts">c0633bt_.ttf</installfile>
-<installfile base="media/fonts">c0648bt_.ttf</installfile>
-<installfile base="media/fonts">c0649bt_.ttf</installfile>
-<installfile base="media/fonts">cour.ttf</installfile>
-<installfile base="media/fonts">courb.ttf</installfile>
-<installfile base="media/fonts">courbi.ttf</installfile>
-<installfile base="media/fonts">helb____.ttf</installfile>
-<installfile base="media/fonts">Marlett.ttf</installfile>
-<installfile base="media/fonts">timr____.ttf</installfile>
-<installfile base="media/fonts">UTB_____.ttf</installfile>
-<installfile base="media/fonts">UTBI____.ttf</installfile>
-<installfile base="media/fonts">UTI_____.ttf</installfile>
-<installfile base="media/fonts">UTRG____.ttf</installfile>
-<installfile base="media/fonts">Vera.ttf</installfile>
-<installfile base="media/fonts">VeraBd.ttf</installfile>
-<installfile base="media/fonts">VeraBI.ttf</installfile>
-<installfile base="media/fonts">VeraIt.ttf</installfile>
-<installfile base="media/fonts">VeraMoBd.ttf</installfile>
-<installfile base="media/fonts">VeraMoBI.ttf</installfile>
-<installfile base="media/fonts">VeraMoIt.ttf</installfile>
-<installfile base="media/fonts">VeraMono.ttf</installfile>
-<installfile base="media/fonts">VeraSe.ttf</installfile>
-<installfile base="media/fonts">VeraSeBd.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSans-Bold.ttf </installfile>
+	<installfile installbase="media/fonts">DejaVuSans.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSans-BoldOblique.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSansCondensed.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSans-ExtraLight.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSansMono.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSansMono-Bold.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSansMono-Oblique.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSans-Oblique.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerif.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerif-Bold.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerifCondensed.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile>
+	<installfile installbase="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile>
+	<installfile installbase="media/fonts">c0419bt_.ttf</installfile>
+	<installfile installbase="media/fonts">c0582bt_.ttf</installfile>
+	<installfile installbase="media/fonts">c0583bt_.ttf</installfile>
+	<installfile installbase="media/fonts">c0611bt_.ttf</installfile>
+	<installfile installbase="media/fonts">c0632bt_.ttf</installfile>
+	<installfile installbase="media/fonts">c0633bt_.ttf</installfile>
+	<installfile installbase="media/fonts">c0648bt_.ttf</installfile>
+	<installfile installbase="media/fonts">c0649bt_.ttf</installfile>
+	<installfile installbase="media/fonts">cour.ttf</installfile>
+	<installfile installbase="media/fonts">courb.ttf</installfile>
+	<installfile installbase="media/fonts">courbi.ttf</installfile>
+	<installfile installbase="media/fonts">helb____.ttf</installfile>
+	<installfile installbase="media/fonts">Marlett.ttf</installfile>
+	<installfile installbase="media/fonts">timr____.ttf</installfile>
+	<installfile installbase="media/fonts">UTB_____.ttf</installfile>
+	<installfile installbase="media/fonts">UTBI____.ttf</installfile>
+	<installfile installbase="media/fonts">UTI_____.ttf</installfile>
+	<installfile installbase="media/fonts">UTRG____.ttf</installfile>
+	<installfile installbase="media/fonts">Vera.ttf</installfile>
+	<installfile installbase="media/fonts">VeraBd.ttf</installfile>
+	<installfile installbase="media/fonts">VeraBI.ttf</installfile>
+	<installfile installbase="media/fonts">VeraIt.ttf</installfile>
+	<installfile installbase="media/fonts">VeraMoBd.ttf</installfile>
+	<installfile installbase="media/fonts">VeraMoBI.ttf</installfile>
+	<installfile installbase="media/fonts">VeraMoIt.ttf</installfile>
+	<installfile installbase="media/fonts">VeraMono.ttf</installfile>
+	<installfile installbase="media/fonts">VeraSe.ttf</installfile>
+	<installfile installbase="media/fonts">VeraSeBd.ttf</installfile>
 </group>
diff --git a/reactos/media/inf/inf.rbuild b/reactos/media/inf/inf.rbuild
index 0ae3bffba50..d58d5eb1858 100644
--- a/reactos/media/inf/inf.rbuild
+++ b/reactos/media/inf/inf.rbuild
@@ -1,23 +1,23 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-	<installfile base="inf">acpi.inf</installfile>
-	<installfile base="inf">cdrom.inf</installfile>
-	<installfile base="inf">display.inf</installfile>
-	<installfile base="inf">hdc.inf</installfile>
-	<installfile base="inf">keyboard.inf</installfile>
-	<installfile base="inf">layout.inf</installfile>
-	<installfile base="inf">machine.inf</installfile>
-	<installfile base="inf">msmouse.inf</installfile>
-	<installfile base="inf">NET_NIC.inf</installfile>
-	<installfile base="inf">netamd.inf</installfile>
-	<installfile base="inf">netisa.inf</installfile>
-	<installfile base="inf">netrtpnt.inf</installfile>
-	<installfile base="inf">nettcpip.inf</installfile>
-	<installfile base="inf">ports.inf</installfile>
-	<installfile base="inf">scsi.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>
+	<installfile installbase="inf">acpi.inf</installfile>
+	<installfile installbase="inf">cdrom.inf</installfile>
+	<installfile installbase="inf">display.inf</installfile>
+	<installfile installbase="inf">hdc.inf</installfile>
+	<installfile installbase="inf">keyboard.inf</installfile>
+	<installfile installbase="inf">layout.inf</installfile>
+	<installfile installbase="inf">machine.inf</installfile>
+	<installfile installbase="inf">msmouse.inf</installfile>
+	<installfile installbase="inf">NET_NIC.inf</installfile>
+	<installfile installbase="inf">netamd.inf</installfile>
+	<installfile installbase="inf">netisa.inf</installfile>
+	<installfile installbase="inf">netrtpnt.inf</installfile>
+	<installfile installbase="inf">nettcpip.inf</installfile>
+	<installfile installbase="inf">ports.inf</installfile>
+	<installfile installbase="inf">scsi.inf</installfile>
+	<installfile installbase="inf" root="output">syssetup.inf</installfile>
+	<installfile installbase="inf">usbport.inf</installfile>
+	<installfile installbase="inf">usbstor.inf</installfile>
+	<installfile installbase="inf">xboxdisp.inf</installfile>
 </group>
diff --git a/reactos/media/nls/nls.rbuild b/reactos/media/nls/nls.rbuild
index a22657a9b8e..d0c919317cf 100644
--- a/reactos/media/nls/nls.rbuild
+++ b/reactos/media/nls/nls.rbuild
@@ -1,62 +1,62 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
 <group>
-<cdfile base="$(CDOUTPUT)">c_437.nls</cdfile>
-<cdfile base="$(CDOUTPUT)">c_1252.nls</cdfile>
-<cdfile base="$(CDOUTPUT)">l_intl.nls</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">c_437.nls</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">c_1252.nls</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">l_intl.nls</cdfile>
 
-<installfile base="system32">c_037.nls</installfile>
-<installfile base="system32">c_424.nls</installfile>
-<installfile base="system32">c_437.nls</installfile>
-<installfile base="system32">c_500.nls</installfile>
-<installfile base="system32">c_737.nls</installfile>
-<installfile base="system32">c_775.nls</installfile>
-<installfile base="system32">c_850.nls</installfile>
-<installfile base="system32">c_852.nls</installfile>
-<installfile base="system32">c_855.nls</installfile>
-<installfile base="system32">c_856.nls</installfile>
-<installfile base="system32">c_857.nls</installfile>
-<installfile base="system32">c_860.nls</installfile>
-<installfile base="system32">c_861.nls</installfile>
-<installfile base="system32">c_862.nls</installfile>
-<installfile base="system32">c_863.nls</installfile>
-<installfile base="system32">c_864.nls</installfile>
-<installfile base="system32">c_865.nls</installfile>
-<installfile base="system32">c_866.nls</installfile>
-<installfile base="system32">c_869.nls</installfile>
-<installfile base="system32">c_874.nls</installfile>
-<installfile base="system32">c_875.nls</installfile>
-<installfile base="system32">c_878.nls</installfile>
-<installfile base="system32">c_932.nls</installfile>
-<installfile base="system32">c_936.nls</installfile>
-<installfile base="system32">c_949.nls</installfile>
-<installfile base="system32">c_950.nls</installfile>
-<installfile base="system32">c_1006.nls</installfile>
-<installfile base="system32">c_1026.nls</installfile>
-<installfile base="system32">c_1250.nls</installfile>
-<installfile base="system32">c_1251.nls</installfile>
-<installfile base="system32">c_1252.nls</installfile>
-<installfile base="system32">c_1253.nls</installfile>
-<installfile base="system32">c_1254.nls</installfile>
-<installfile base="system32">c_1255.nls</installfile>
-<installfile base="system32">c_1256.nls</installfile>
-<installfile base="system32">c_1257.nls</installfile>
-<installfile base="system32">c_1258.nls</installfile>
-<installfile base="system32">c_10000.nls</installfile>
-<installfile base="system32">c_10006.nls</installfile>
-<installfile base="system32">c_10007.nls</installfile>
-<installfile base="system32">c_10029.nls</installfile>
-<installfile base="system32">c_10079.nls</installfile>
-<installfile base="system32">c_10081.nls</installfile>
-<installfile base="system32">c_20866.nls</installfile>
-<installfile base="system32">c_28591.nls</installfile>
-<installfile base="system32">c_28592.nls</installfile>
-<installfile base="system32">c_28593.nls</installfile>
-<installfile base="system32">c_28594.nls</installfile>
-<installfile base="system32">c_28595.nls</installfile>
-<installfile base="system32">c_28596.nls</installfile>
-<installfile base="system32">c_28597.nls</installfile>
-<installfile base="system32">c_28598.nls</installfile>
-<installfile base="system32">c_28599.nls</installfile>
-<installfile base="system32">l_intl.nls</installfile>
+	<installfile installbase="system32">c_037.nls</installfile>
+	<installfile installbase="system32">c_424.nls</installfile>
+	<installfile installbase="system32">c_437.nls</installfile>
+	<installfile installbase="system32">c_500.nls</installfile>
+	<installfile installbase="system32">c_737.nls</installfile>
+	<installfile installbase="system32">c_775.nls</installfile>
+	<installfile installbase="system32">c_850.nls</installfile>
+	<installfile installbase="system32">c_852.nls</installfile>
+	<installfile installbase="system32">c_855.nls</installfile>
+	<installfile installbase="system32">c_856.nls</installfile>
+	<installfile installbase="system32">c_857.nls</installfile>
+	<installfile installbase="system32">c_860.nls</installfile>
+	<installfile installbase="system32">c_861.nls</installfile>
+	<installfile installbase="system32">c_862.nls</installfile>
+	<installfile installbase="system32">c_863.nls</installfile>
+	<installfile installbase="system32">c_864.nls</installfile>
+	<installfile installbase="system32">c_865.nls</installfile>
+	<installfile installbase="system32">c_866.nls</installfile>
+	<installfile installbase="system32">c_869.nls</installfile>
+	<installfile installbase="system32">c_874.nls</installfile>
+	<installfile installbase="system32">c_875.nls</installfile>
+	<installfile installbase="system32">c_878.nls</installfile>
+	<installfile installbase="system32">c_932.nls</installfile>
+	<installfile installbase="system32">c_936.nls</installfile>
+	<installfile installbase="system32">c_949.nls</installfile>
+	<installfile installbase="system32">c_950.nls</installfile>
+	<installfile installbase="system32">c_1006.nls</installfile>
+	<installfile installbase="system32">c_1026.nls</installfile>
+	<installfile installbase="system32">c_1250.nls</installfile>
+	<installfile installbase="system32">c_1251.nls</installfile>
+	<installfile installbase="system32">c_1252.nls</installfile>
+	<installfile installbase="system32">c_1253.nls</installfile>
+	<installfile installbase="system32">c_1254.nls</installfile>
+	<installfile installbase="system32">c_1255.nls</installfile>
+	<installfile installbase="system32">c_1256.nls</installfile>
+	<installfile installbase="system32">c_1257.nls</installfile>
+	<installfile installbase="system32">c_1258.nls</installfile>
+	<installfile installbase="system32">c_10000.nls</installfile>
+	<installfile installbase="system32">c_10006.nls</installfile>
+	<installfile installbase="system32">c_10007.nls</installfile>
+	<installfile installbase="system32">c_10029.nls</installfile>
+	<installfile installbase="system32">c_10079.nls</installfile>
+	<installfile installbase="system32">c_10081.nls</installfile>
+	<installfile installbase="system32">c_20866.nls</installfile>
+	<installfile installbase="system32">c_28591.nls</installfile>
+	<installfile installbase="system32">c_28592.nls</installfile>
+	<installfile installbase="system32">c_28593.nls</installfile>
+	<installfile installbase="system32">c_28594.nls</installfile>
+	<installfile installbase="system32">c_28595.nls</installfile>
+	<installfile installbase="system32">c_28596.nls</installfile>
+	<installfile installbase="system32">c_28597.nls</installfile>
+	<installfile installbase="system32">c_28598.nls</installfile>
+	<installfile installbase="system32">c_28599.nls</installfile>
+	<installfile installbase="system32">l_intl.nls</installfile>
 </group>
\ No newline at end of file
diff --git a/reactos/ntoskrnl/ntoskrnl.rbuild b/reactos/ntoskrnl/ntoskrnl.rbuild
index 440a6795178..5431d9269b9 100644
--- a/reactos/ntoskrnl/ntoskrnl.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl.rbuild
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd">
 <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe">
-	<bootstrap base="$(CDOUTPUT)" />
+	<bootstrap installbase="$(CDOUTPUT)" />
 	<importlibrary definition="ntoskrnl.def" />
 	<define name="_DISABLE_TIDENTS" />
 	<define name="__NTOSKRNL__" />
diff --git a/reactos/tools/rbuild/bootstrap.cpp b/reactos/tools/rbuild/bootstrap.cpp
index 93393677c86..ae5a5f215be 100644
--- a/reactos/tools/rbuild/bootstrap.cpp
+++ b/reactos/tools/rbuild/bootstrap.cpp
@@ -97,7 +97,7 @@ Bootstrap::Initialize ()
 			"<bootstrap> is not applicable for this module type." );
 	}
 
-	const XMLAttribute* att = node.GetAttribute ( "base", false );
+	const XMLAttribute* att = node.GetAttribute ( "installbase", false );
 	if ( att != NULL )
 		base = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value );
 	else
diff --git a/reactos/tools/rbuild/cdfile.cpp b/reactos/tools/rbuild/cdfile.cpp
index fb5769bb6ba..254cc519f53 100644
--- a/reactos/tools/rbuild/cdfile.cpp
+++ b/reactos/tools/rbuild/cdfile.cpp
@@ -39,7 +39,7 @@ CDFile::CDFile ( const Project& project,
                  const string& path )
 	: XmlNode ( project, cdfileNode )
 {
-	const XMLAttribute* att = cdfileNode.GetAttribute ( "base", false );
+	const XMLAttribute* att = cdfileNode.GetAttribute ( "installbase", false );
 	string target_relative_directory;
 	if ( att != NULL )
 		target_relative_directory = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value );
diff --git a/reactos/tools/rbuild/doc/rbuild.txt b/reactos/tools/rbuild/doc/rbuild.txt
index 19fd8411cb1..ffe0a711a12 100644
--- a/reactos/tools/rbuild/doc/rbuild.txt
+++ b/reactos/tools/rbuild/doc/rbuild.txt
@@ -177,10 +177,10 @@ Bootstrap element
 A bootstrap element specifies that the generated file should be put on the bootable CD as a bootstrap file.
 
 Syntax:
-	<bootstrap base="reactos" nameoncd="halmp.dll" />
+	<bootstrap installbase="reactos" nameoncd="halmp.dll" />
 
 Attributes:
-	base - Put file in this directory on the bootable CD. This attribute is optional.
+	installbase - Put file in this directory on the bootable CD. This attribute is optional.
 	nameoncd - Name of file on the bootable CD. This attribute is optional.
 
 Value:
@@ -195,10 +195,10 @@ CDFile element
 A cdfile element specifies the name of a file that is to be put on the bootable CD.
 
 Syntax:
-	<cdfile base="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile>
+	<cdfile installbase="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile>
 
 Attributes:
-	base - Put file in this directory on the bootable CD. This attribute is optional.
+	installbase - Put file in this directory on the bootable CD. This attribute is optional.
 	nameoncd - Name of file on the bootable CD. This attribute is optional.
 
 Value:
@@ -392,10 +392,10 @@ Installfile element
 An installfile element specifies the name of a file that is to be installed when using 'make install'.
 
 Syntax:
-	<installfile base="reactos" newname="ReadMe.txt">ReadMe.txt</installfile>
+	<installfile installbase="reactos" newname="ReadMe.txt">ReadMe.txt</installfile>
 
 Attributes:
-	base - Put file in this directory within the install directory. This attribute is optional.
+	installbase - Put file in this directory within the install directory. This attribute is optional.
 	newname - Name of file within the install directory. This attribute is optional.
 
 Value:
diff --git a/reactos/tools/rbuild/installfile.cpp b/reactos/tools/rbuild/installfile.cpp
index 6ad5de558ee..346100c2c23 100644
--- a/reactos/tools/rbuild/installfile.cpp
+++ b/reactos/tools/rbuild/installfile.cpp
@@ -27,7 +27,7 @@ InstallFile::InstallFile ( const Project& project,
                            const string& path )
 	: XmlNode(project, installfileNode )
 {
-	const XMLAttribute* base = node.GetAttribute ( "base", false );
+	const XMLAttribute* base = node.GetAttribute ( "installbase", false );
 	const XMLAttribute* newname = node.GetAttribute ( "newname", false );
 
 	DirectoryLocation source_directory = SourceDirectory;
diff --git a/reactos/tools/rbuild/project.dtd b/reactos/tools/rbuild/project.dtd
index 166001b7fc2..dc2f887e0cf 100644
--- a/reactos/tools/rbuild/project.dtd
+++ b/reactos/tools/rbuild/project.dtd
@@ -22,14 +22,14 @@
 
 <!ELEMENT bootstrap EMPTY>
 <!ATTLIST bootstrap
-	base      %Text; #IMPLIED
-	nameoncd  %Text; #IMPLIED
+	installbase %Text; #IMPLIED
+	nameoncd    %Text; #IMPLIED
 >
 
 <!ELEMENT cdfile (#PCDATA)>
 <!ATTLIST cdfile
-	base      %Text; #IMPLIED
-	nameoncd  %Text; #IMPLIED
+	installbase %Text; #IMPLIED
+	nameoncd    %Text; #IMPLIED
 >
 
 <!ELEMENT compilerflag (#PCDATA)>
@@ -55,8 +55,8 @@
 
 <!ELEMENT installfile (#PCDATA)>
 <!ATTLIST installfile
-	base %Text; #IMPLIED
-	root (intermediate|output) #IMPLIED
+	installbase %Text; #IMPLIED
+	root        (intermediate|output) #IMPLIED
 >
 
 <!ELEMENT group (cdfile*|define*|directory*|file*|if*|ifnot*|include*|installfile*|property*|module*|group*|xi:include*)+>