diff --git a/Prebuild/ChangeLog b/Prebuild/ChangeLog
index 80929997a4..c1c8be1dbd 100644
--- a/Prebuild/ChangeLog
+++ b/Prebuild/ChangeLog
@@ -1,3 +1,6 @@
+2017, August Unit Umarov
+	* add Freak Tech patch for prefer32bit default to false
+
 2015, June	Fly-Man- <fly.man.opensim@gmail.com>
 	* V2.0.7	(WhiteCore Build)
 	* Added the VS2012/VS2013 targets so .Net 4.5 can be used for WhiteCore
diff --git a/Prebuild/src/Core/Targets/VSGenericTarget.cs b/Prebuild/src/Core/Targets/VSGenericTarget.cs
index b8904add84..570c3a4599 100644
--- a/Prebuild/src/Core/Targets/VSGenericTarget.cs
+++ b/Prebuild/src/Core/Targets/VSGenericTarget.cs
@@ -235,7 +235,7 @@ namespace Prebuild.Core.Targets
 					ps.WriteLine("	  <ConfigurationOverrideFile>");
 					ps.WriteLine("	  </ConfigurationOverrideFile>");
 					ps.WriteLine("	  <DefineConstants>{0}</DefineConstants>",
-                        conf.Options["CompilerDefines"] == "" ? this.kernel.ForcedConditionals : conf.Options["CompilerDefines"] + ";" + kernel.ForcedConditionals);
+                        conf.Options["CompilerDefines"].ToString() == "" ? this.kernel.ForcedConditionals : conf.Options["CompilerDefines"] + ";" + kernel.ForcedConditionals);
 					ps.WriteLine("	  <DocumentationFile>{0}</DocumentationFile>", Helper.NormalizePath(conf.Options["XmlDocFile"].ToString()));
 					ps.WriteLine("	  <DebugSymbols>{0}</DebugSymbols>", conf.Options["DebugInformation"]);
 					ps.WriteLine("	  <FileAlignment>{0}</FileAlignment>", conf.Options["FileAlignment"]);
@@ -254,6 +254,7 @@ namespace Prebuild.Core.Targets
 					ps.WriteLine("	  <NoStdLib>{0}</NoStdLib>", conf.Options["NoStdLib"]);
 					ps.WriteLine("	  <NoWarn>{0}</NoWarn>", conf.Options["SuppressWarnings"]);
 					ps.WriteLine("	  <PlatformTarget>{0}</PlatformTarget>", conf.Platform);
+                    ps.WriteLine("    <Prefer32Bit>false</Prefer32Bit>");
 					ps.WriteLine("	</PropertyGroup>");
 				}
 
diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs
index ebb832a8fd..079d6a540f 100644
--- a/Prebuild/src/Properties/AssemblyInfo.cs
+++ b/Prebuild/src/Properties/AssemblyInfo.cs
@@ -68,7 +68,8 @@ using System.Resources;
                              "Rob Loach, " +
                              "David Hudson," +
                              "John Hurliman" +
-                             "WhiteCore Development")]
+                             "WhiteCore Development" +
+                             "OpenSimulator developers")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]