diff --git a/OpenSim.RegionServer/OpenSim.exe.build b/OpenSim.RegionServer/OpenSim.exe.build
new file mode 100644
index 0000000000..86ee484c72
--- /dev/null
+++ b/OpenSim.RegionServer/OpenSim.exe.build
@@ -0,0 +1,67 @@
+<?xml version="1.0" ?>
+<project name="OpenSim" default="build">
+    <target name="build">
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <copy todir="${project::get-base-directory()}/${build.dir}">
+            <fileset basedir="${project::get-base-directory()}">
+            </fileset>
+        </copy>
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+            <resources prefix="OpenSim" dynamicprefix="true" >
+            </resources>
+            <sources failonempty="true">
+                <include name="Grid.cs" />
+                <include name="OpenSimApplication.cs" />
+                <include name="OpenSimMain.cs" />
+                <include name="OpenSimRoot.cs" />
+                <include name="QueItem.cs" />
+                <include name="SimClient.cs" />
+                <include name="SimConsole.cs" />
+                <include name="VersionInfo.cs" />
+                <include name="Assets/AssetCache.cs" />
+                <include name="Assets/InventoryCache.cs" />
+                <include name="CAPS/SimHttp.cs" />
+                <include name="types/Mesh.cs" />
+                <include name="types/Triangle.cs" />
+                <include name="UserServer/LocalUserProfileManager.cs" />
+                <include name="UserServer/LoginServer.cs" />
+                <include name="world/Avatar.cs" />
+                <include name="world/Entity.cs" />
+                <include name="world/Primitive.cs" />
+                <include name="world/ScriptEngine.cs" />
+                <include name="world/SurfacePatch.cs" />
+                <include name="world/World.cs" />
+                <include name="world/scripting/IScript.cs" />
+            </sources>
+            <references basedir="${project::get-base-directory()}">
+                <lib>
+                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
+                </lib>
+                <include name="System.dll" />
+                <include name="System.Xml.dll.dll" />
+                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/Axiom.MathLib.dll" />
+                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../OpenSim.Framework.Console/${build.dir}/OpenSim.Framework.Console.dll" />
+                <include name="../OpenSim.Physics/Manager/${build.dir}/OpenSim.Physics.Manager.dll" />
+                <include name="../OpenSim.Framework/${build.dir}/OpenSim.Framework.dll" />
+            </references>
+        </csc>
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <copy todir="${project::get-base-directory()}/../bin/">
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+                <include name="*.dll"/>
+                <include name="*.exe"/>
+            </fileset>
+        </copy>
+    </target>
+    <target name="clean">
+        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
+    </target>
+    <target name="doc" description="Creates documentation.">
+    </target>
+</project>
diff --git a/OpenSim.build b/OpenSim.build
index 6013f9db7e..8f5c4152b2 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -53,9 +53,9 @@
         <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
         <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
         <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
-        <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.exe.build" target="clean" />
         <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
         <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
+        <nant buildfile="OpenSim.RegionServer/OpenSim.exe.build" target="clean" />
     </target>
 
     <target name="build" depends="init" description="">
@@ -67,7 +67,7 @@
         <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
         <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
         <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />
-        <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.exe.build" target="build" />
+        <nant buildfile="OpenSim.RegionServer/OpenSim.exe.build" target="build" />
         <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
     </target>
 
@@ -86,9 +86,9 @@
         <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
         <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
         <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
-        <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.exe.build" target="doc" />
         <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
         <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
+        <nant buildfile="OpenSim.RegionServer/OpenSim.exe.build" target="doc" />
     </target>
 
 </project>
diff --git a/prebuild.xml b/prebuild.xml
index ca3ac2f359..45cafb6a7b 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -215,7 +215,7 @@
     </Project>
 
     <!-- OpenSim app -->
-    <Project name="OpenSim.RegionServer" path="OpenSim.RegionServer" type="Exe" startupObject="OpenSim.RegionServer">
+    <Project name="OpenSim" path="OpenSim.RegionServer" type="Exe" startupObject="OpenSim">
       <Configuration name="Debug">
         <Options>
           <OutputPath>../bin/</OutputPath>
@@ -267,6 +267,16 @@
       </Files>
     </Project>
   </Solution>
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  <!-- Prebuild tool -->
   <Solution name="Prebuild" path="./Prebuild/" >
     <Configuration name="Debug">
       <Options>