diff --git a/Source/Build.Tasks/Common.xml b/Source/Build.Tasks/Common.xml
index 8545edcb..911dfa32 100644
--- a/Source/Build.Tasks/Common.xml
+++ b/Source/Build.Tasks/Common.xml
@@ -2,8 +2,9 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' != 'Debug' ">Release</Configuration>
-    <BuildTasksPath Condition="'$(BuildTasksPath)' == ''">..\..\Binaries\OpenTK\$(Configuration)</BuildTasksPath>
+    <TaskConfig Condition=" '$(Configuration)' != 'Debug' ">Release</TaskConfig>
+    <TaskConfig Condition=" '$(Configuration)' == 'Debug' ">Debug</TaskConfig>
+    <BuildTasksPath Condition="'$(BuildTasksPath)' == ''">..\..\Binaries\OpenTK\$(TaskConfig)</BuildTasksPath>
     <BuildTasksLib>$(BuildTasksPath)\Build.Tasks.dll</BuildTasksLib>
   </PropertyGroup>
 
diff --git a/Source/Build.UpdateVersion/Build.UpdateVersion.csproj b/Source/Build.UpdateVersion/Build.UpdateVersion.csproj
index 18010470..7986699e 100644
--- a/Source/Build.UpdateVersion/Build.UpdateVersion.csproj
+++ b/Source/Build.UpdateVersion/Build.UpdateVersion.csproj
@@ -14,7 +14,6 @@
   </PropertyGroup>
   <PropertyGroup>
     <ProjectGuid>{75DC22B1-113F-4A66-96B9-2FF8208C10E8}</ProjectGuid>
-    <Configuration Condition="$(Configuration) == ''">Release</Configuration>
   </PropertyGroup>
   <Import Project="..\Build.Tasks\Common.xml" />
   <Target Name="UpdateVersion">
@@ -25,5 +24,6 @@
   </Target>
   <Target Name="Rebuild">
     <CallTarget Targets="UpdateVersion" />
-  </Target>  <Target Name="Clean" />
-</Project>
\ No newline at end of file
+  </Target>
+  <Target Name="Clean" />
+</Project>