diff --git a/Database/RodaxSoftware.FactuGES.Database.proj b/Database/RodaxSoftware.FactuGES.Database.proj
index 8ebaaab5..4411cddd 100644
--- a/Database/RodaxSoftware.FactuGES.Database.proj
+++ b/Database/RodaxSoftware.FactuGES.Database.proj
@@ -34,13 +34,19 @@
 		<MakeDir Directories="$(OutputPath)" Condition="!Exists('$(OutputPath)')"/>
 	</Target>
 
-    <Target Name="Build" 
+   <Target Name="Build" 
+           DependsOnTargets="CreateDatabase;InsertSysData"/>
+
+
+    <Target Name="CreateDatabase" 
            Inputs="@(Sql)" 
            Outputs="@(SqlOutput)">
 
 		<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q" 
 			WorkingDirectory="$(OutputPath)" />
-			
+   </Target>
+   
+    <Target Name="InsertSysData">
 		<Exec Command="$(DOUBLE_QUOTES)$(SqlCmdRunner)$(DOUBLE_QUOTES) -i $(DOUBLE_QUOTES)$(SqlScriptsFolder)\factuges_sysdata.sql$(DOUBLE_QUOTES) -u $(DBUser) -p $(DBPassword) -q $(DOUBLE_QUOTES)$(OutputPath)\factuges.fdb$(DOUBLE_QUOTES)" 
 			WorkingDirectory="$(OutputPath)" />			
    </Target>