diff --git a/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.2010.csproj b/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.2010.csproj
index 3e9d2519db..740ae04cff 100644
--- a/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.2010.csproj
+++ b/src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.2010.csproj
@@ -25,7 +25,7 @@
full
false
..\..\..\..\..\managed\debug\
- DEBUG;TRACE
+ TRACE;DEBUG;CLR_VERSION40
prompt
4
@@ -33,7 +33,7 @@
pdbonly
true
..\..\..\..\..\managed\release\
- TRACE
+ TRACE;CLR_VERSION40
prompt
4
diff --git a/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs b/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs
index ad8e3a11e6..754541a8f2 100644
--- a/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs
+++ b/src/mod/languages/mod_managed/managed/ScriptPluginManager.cs
@@ -110,10 +110,18 @@ namespace FreeSWITCH {
cdp = CodeDomProvider.CreateProvider("f#");
break;
case ".csx":
+#if (CLR_VERSION40)
+ cdp = new Microsoft.CSharp.CSharpCodeProvider(new Dictionary { { "CompilerVersion", "v4.0" } });
+#else
cdp = new Microsoft.CSharp.CSharpCodeProvider(new Dictionary { { "CompilerVersion", "v3.5" } });
+#endif
break;
case ".vbx":
+#if (CLR_VERSION40)
+ cdp = new Microsoft.VisualBasic.VBCodeProvider(new Dictionary { { "CompilerVersion", "v4.0" } });
+#else
cdp = new Microsoft.VisualBasic.VBCodeProvider(new Dictionary { { "CompilerVersion", "v3.5" } });
+#endif
break;
case ".jsx":
// Have to figure out better JS support