diff --git a/AutoTx/ATXProject.csproj b/AutoTx/ATXProject.csproj
index d1a9b28dae662258f60a5a7e8a3aea6c2770b653..3281374886ebf759c0896f9635b4685a4badf008 100644
--- a/AutoTx/ATXProject.csproj
+++ b/AutoTx/ATXProject.csproj
@@ -150,6 +150,10 @@
   <PropertyGroup>
     <PreBuildEvent>PowerShell -Command "Get-Date -Format 'yyyy-MM-dd HH:mm:ss' &gt; $(ProjectDir)\Resources\BuildDate.txt ; Get-Content $(ProjectDir)\Resources\BuildDate.txt"
 </PreBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PostBuildEvent>PowerShell -Command "Write-Host $(ConfigurationName)" &gt; $(ProjectDir)\Resources\BuildConfiguration.txt
+</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/AutoTx/Resources/.gitignore b/AutoTx/Resources/.gitignore
index 8caf53c27541003f7a1e99928459e273a97b2ebe..8b0d5a6fe3aeee777e36cce66cfe514cb9741bec 100644
--- a/AutoTx/Resources/.gitignore
+++ b/AutoTx/Resources/.gitignore
@@ -1 +1,2 @@
 BuildDate.txt
+BuildConfiguration.txt
diff --git a/Scripts/Make-Package.ps1 b/Scripts/Make-Package.ps1
index a285907e947d3dce28537eb339594e8aa6a06873..5e93d6215f4d3edd950e06a6a71827f5d0191f7f 100644
--- a/Scripts/Make-Package.ps1
+++ b/Scripts/Make-Package.ps1
@@ -1,12 +1,5 @@
-[CmdletBinding()]
-Param(
-    [ValidateSet("Debug", "Release")][String] $Target = "Debug"
-)
-
-
 $ResourceDir = "..\AutoTx\Resources"
 $TemplateDir = "$($ResourceDir)\Mail-Templates"
-$BinariesDir = "..\AutoTx\bin\$($Target)"
 
 try {
     $BuildDate = Get-Content "$($ResourceDir)\BuildDate.txt" -EA Stop
@@ -15,14 +8,23 @@ catch {
     Write-Host "Error reading build-date, stopping."
     Exit
 }
+try {
+    $BuildConfiguration = Get-Content "$($ResourceDir)\BuildConfiguration.txt" -EA Stop
+}
+catch {
+    Write-Host "Error reading build configuration, stopping."
+    Exit
+}
+
 
 $PkgDir = $BuildDate -replace ':','-' -replace ' ','_'
 $PkgDir = "build_" + $PkgDir
+$BinariesDir = "..\AutoTx\bin\$($BuildConfiguration)"
 
 Write-Host "Creating package [$($PkgDir)] using binaries from [$($BinariesDir)]"
 
 if (Test-Path $PkgDir) {
-    Write-Host "Removing existing package dir..."
+    Write-Host "Removing existing package dir [$($PkgDir)]..."
     Remove-Item -Recurse -Force $PkgDir
 }
 
@@ -38,6 +40,9 @@ Copy-Item "$($ResourceDir)\configuration-example.xml" $tgt
 Copy-Item "$($ResourceDir)\configuration-example.xml" "$($PkgDir)\configuration.xml"
 Copy-Item "$($ResourceDir)\status-example.xml" "$($PkgDir)\status.xml"
 Copy-Item "$($ResourceDir)\BuildDate.txt" "$($PkgDir)\service.log"
+Copy-Item "$($ResourceDir)\BuildConfiguration.txt" $($PkgDir)
 
 Copy-Item "ScriptsConfig.ps1" $PkgDir
-Copy-Item "Install-Service.ps1" $PkgDir
\ No newline at end of file
+Copy-Item "Install-Service.ps1" $PkgDir
+
+Write-Host "Done creating package [$($PkgDir)] (config: $($BuildConfiguration))"
\ No newline at end of file