diff --git a/ThePimp/Makefile.am b/ThePimp/Makefile.am
index ecdde5e..14ad272 100644
--- a/ThePimp/Makefile.am
+++ b/ThePimp/Makefile.am
@@ -31,13 +31,13 @@ image_sources = \
 
 if USE_CSHARP
 if USE_GTKSHARP
-bin_SCRIPTS = Pimp.exe
+bin_SCRIPTS = ThePimp.exe
 endif
 endif
 
 EXTRA_DIST = $(pimp_sources) $(pimp_resources) $(image_sources)
 
-Pimp.exe: ../pipi-sharp/pipi-sharp.dll $(pimp_sources) $(pimp_resources)
+ThePimp.exe: ../pipi-sharp/pipi-sharp.dll $(pimp_sources) $(pimp_resources)
 	cp ../pipi-sharp/pipi-sharp.dll .
 	cp ../pipi-sharp/pipi-sharp.dll.config .
 	cp ../pipi-sharp/pipi-sharp.dll.mdb .
diff --git a/ThePimp/ThePimp.mdp b/ThePimp/ThePimp.mdp
index f9e2fce..74e0d8e 100644
--- a/ThePimp/ThePimp.mdp
+++ b/ThePimp/ThePimp.mdp
@@ -4,8 +4,10 @@
       <CustomCommands>
         <Command type="AfterBuild" command="cp ${CombineDir}/pipi-sharp/pipi-sharp.dll.config ${TargetDir}" workingdir="" />
         <Command type="AfterBuild" command="cp ${CombineDir}/pipi-sharp/pipi-sharp.dll.mdb ${TargetDir}" />
+        <Command type="AfterClean" command="rm -f ${TargetDir}/pipi-sharp.dll.config" />
+        <Command type="AfterClean" command="rm -f ${TargetDir}/pipi-sharp.dll.mdb" />
       </CustomCommands>
-      <Output directory="." assemblyKeyFile="." assembly="Pimp" />
+      <Output directory="." assemblyKeyFile="." assembly="ThePimp" />
       <Build debugmode="True" target="Exe" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" definesymbols="DEBUG" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
@@ -14,8 +16,10 @@
       <CustomCommands>
         <Command type="AfterBuild" command="cp ${CombineDir}/pipi-sharp/pipi-sharp.dll.config ${TargetDir}" />
         <Command type="AfterBuild" command="cp ${CombineDir}/pipi-sharp/pipi-sharp.dll.mdb ${TargetDir}" />
+        <Command type="AfterClean" command="rm -f ${TargetDir}/pipi-sharp.dll.config" />
+        <Command type="AfterClean" command="rm -f ${TargetDir}/pipi-sharp.dll.mdb" />
       </CustomCommands>
-      <Output directory="." assemblyKeyFile="." assembly="Pimp" />
+      <Output directory="." assemblyKeyFile="." assembly="ThePimp" />
       <Build debugmode="False" target="Exe" />
       <Execution runwithwarnings="True" consolepause="True" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="False" generateoverflowchecks="True" mainclass="" generatexmldocumentation="False" win32Icon="." ctype="CSharpCompilerParameters" />
@@ -63,4 +67,4 @@
       <Widget>ThePimp.ToolBox</Widget>
     </ExportedWidgets>
   </GtkDesignInfo>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/libpipi.mds b/libpipi.mds
index 9e38d82..ebb9181 100644
--- a/libpipi.mds
+++ b/libpipi.mds
@@ -1,20 +1,24 @@
 <Combine name="ThePimp" fileversion="2.0">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="CombineConfiguration">
+      <Entry build="True" name="libpipi" configuration="Default" />
       <Entry build="True" name="pipi-sharp" configuration="Debug" />
       <Entry build="True" name="ThePimp" configuration="Debug" />
     </Configuration>
     <Configuration name="Release" ctype="CombineConfiguration">
+      <Entry build="True" name="libpipi" configuration="Default" />
       <Entry build="True" name="pipi-sharp" configuration="Release" />
       <Entry build="True" name="ThePimp" configuration="Release" />
     </Configuration>
   </Configurations>
   <StartMode startupentry="ThePimp" single="True">
+    <Execute type="None" entry="libpipi" />
     <Execute type="None" entry="pipi-sharp" />
     <Execute type="None" entry="ThePimp" />
   </StartMode>
   <Entries>
+    <Entry filename="pipi/libpipi.mdp" />
     <Entry filename="pipi-sharp/pipi-sharp.mdp" />
     <Entry filename="ThePimp/ThePimp.mdp" />
   </Entries>
-</Combine>
\ No newline at end of file
+</Combine>
diff --git a/pipi-sharp/pipi-sharp.mdp b/pipi-sharp/pipi-sharp.mdp
index f412c1b..4f8c6f6 100644
--- a/pipi-sharp/pipi-sharp.mdp
+++ b/pipi-sharp/pipi-sharp.mdp
@@ -1,12 +1,18 @@
 <Project name="pipi-sharp" fileversion="2.0" language="C#" clr-version="Net_2_0" ctype="DotNetProject">
   <Configurations active="Debug">
     <Configuration name="Debug" ctype="DotNetProjectConfiguration">
-      <Output directory="." assembly="pipi-sharp" />
+      <CustomCommands>
+        <Command type="AfterBuild" command="sh -c &quot;rm -f pipi-sharp.dll.config &amp;&amp; make pipi-sharp.dll.config&quot;" workingdir="${TargetDir}" />
+      </CustomCommands>
+      <Output directory="." assemblyKeyFile="." assembly="pipi-sharp" />
       <Build debugmode="True" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
       <CodeGeneration compiler="Mcs" warninglevel="4" optimize="True" unsafecodeallowed="True" generateoverflowchecks="True" definesymbols="DEBUG" generatexmldocumentation="False" ctype="CSharpCompilerParameters" />
     </Configuration>
     <Configuration name="Release" ctype="DotNetProjectConfiguration">
+      <CustomCommands>
+        <Command type="AfterBuild" command="sh -c &quot;rm -f pipi-sharp.dll.config &amp;&amp; make pipi-sharp.dll.config&quot;" workingdir="${TargetDir}" />
+      </CustomCommands>
       <Output directory="." assembly="pipi-sharp" />
       <Build debugmode="False" target="Library" />
       <Execution runwithwarnings="True" consolepause="False" runtime="MsNet" clr-version="Net_2_0" />
diff --git a/pipi/libpipi.mdp b/pipi/libpipi.mdp
new file mode 100644
index 0000000..157078e
--- /dev/null
+++ b/pipi/libpipi.mdp
@@ -0,0 +1,18 @@
+<Project name="libpipi" fileversion="2.0" ctype="GenericProject">
+  <Configurations active="Default">
+    <Configuration name="Default" ctype="GenericProjectConfiguration">
+      <CustomCommands>
+        <Command type="BeforeBuild" command="sh -c &quot;test -f configure || ./bootstrap&quot;" workingdir="${CombineDir}" />
+        <Command type="BeforeBuild" command="sh -c &quot;test -f Makefile || ./configure&quot;" workingdir="${CombineDir}" />
+        <Command type="BeforeBuild" command="make -C pipi" workingdir="${CombineDir}" />
+        <Command type="Clean" command="make -C pipi clean" workingdir="${CombineDir}" />
+      </CustomCommands>
+      <Output directory="." />
+      <Build debugmode="True" />
+      <Execution runwithwarnings="True" consolepause="True" />
+    </Configuration>
+  </Configurations>
+  <Contents>
+    <File name="pipi.h" subtype="Code" buildaction="Nothing" />
+  </Contents>
+</Project>
\ No newline at end of file