diff --git a/Modules/CMakeCSharpInformation.cmake b/Modules/CMakeCSharpInformation.cmake
index cd86016270..d474c29418 100644
--- a/Modules/CMakeCSharpInformation.cmake
+++ b/Modules/CMakeCSharpInformation.cmake
@@ -10,7 +10,7 @@ get_filename_component(CMAKE_BASE_NAME "${CMAKE_CSharp_COMPILER}" NAME_WE)
 
 set(CMAKE_BUILD_TYPE_INIT Debug)
 
-set(CMAKE_CSharp_FLAGS_INIT "/define:TRACE /langversion:3 /nowin32manifest")
+set(CMAKE_CSharp_FLAGS_INIT "/define:TRACE /langversion:3")
 set(CMAKE_CSharp_FLAGS_DEBUG_INIT "/debug:full /optimize- /warn:3 /errorreport:prompt /define:DEBUG")
 set(CMAKE_CSharp_FLAGS_RELEASE_INIT "/debug:none /optimize  /warn:1  /errorreport:queue")
 set(CMAKE_CSharp_FLAGS_RELWITHDEBINFO_INIT "/debug:full /optimize-")
diff --git a/Source/cmVS10CSharpFlagTable.h b/Source/cmVS10CSharpFlagTable.h
index 493ec2b12c..18d587c503 100644
--- a/Source/cmVS10CSharpFlagTable.h
+++ b/Source/cmVS10CSharpFlagTable.h
@@ -25,7 +25,8 @@ static cmVS7FlagTable cmVS10CSharpFlagTable[] = {
   { "ApplicationIcon", "win32icon", "", "",
     cmIDEFlagTable::UserValueRequired },
 
-  { "Win32Manifest", "win32manifest:", "", "true", 0 },
+  { "ApplicationManifest", "win32manifest:", "", "",
+    cmIDEFlagTable::UserValueRequired },
 
   { "NoWin32Manifest", "nowin32manifest", "", "true", 0 },
 
diff --git a/Source/cmVS11CSharpFlagTable.h b/Source/cmVS11CSharpFlagTable.h
index 71870b698e..e3ba83c2c8 100644
--- a/Source/cmVS11CSharpFlagTable.h
+++ b/Source/cmVS11CSharpFlagTable.h
@@ -25,7 +25,8 @@ static cmVS7FlagTable cmVS11CSharpFlagTable[] = {
   { "ApplicationIcon", "win32icon", "", "",
     cmIDEFlagTable::UserValueRequired },
 
-  { "Win32Manifest", "win32manifest:", "", "true", 0 },
+  { "ApplicationManifest", "win32manifest:", "", "",
+    cmIDEFlagTable::UserValueRequired },
 
   { "NoWin32Manifest", "nowin32manifest", "", "true", 0 },
 
diff --git a/Source/cmVS12CSharpFlagTable.h b/Source/cmVS12CSharpFlagTable.h
index f98b1840d4..f8db636709 100644
--- a/Source/cmVS12CSharpFlagTable.h
+++ b/Source/cmVS12CSharpFlagTable.h
@@ -25,7 +25,8 @@ static cmVS7FlagTable cmVS12CSharpFlagTable[] = {
   { "ApplicationIcon", "win32icon", "", "",
     cmIDEFlagTable::UserValueRequired },
 
-  { "Win32Manifest", "win32manifest:", "", "true", 0 },
+  { "ApplicationManifest", "win32manifest:", "", "",
+    cmIDEFlagTable::UserValueRequired },
 
   { "NoWin32Manifest", "nowin32manifest", "", "true", 0 },
 
diff --git a/Source/cmVS140CSharpFlagTable.h b/Source/cmVS140CSharpFlagTable.h
index 256c35f700..055d5cba06 100644
--- a/Source/cmVS140CSharpFlagTable.h
+++ b/Source/cmVS140CSharpFlagTable.h
@@ -25,7 +25,8 @@ static cmVS7FlagTable cmVS140CSharpFlagTable[] = {
   { "ApplicationIcon", "win32icon", "", "",
     cmIDEFlagTable::UserValueRequired },
 
-  { "Win32Manifest", "win32manifest:", "", "true", 0 },
+  { "ApplicationManifest", "win32manifest:", "", "",
+    cmIDEFlagTable::UserValueRequired },
 
   { "NoWin32Manifest", "nowin32manifest", "", "true", 0 },
 
diff --git a/Source/cmVS141CSharpFlagTable.h b/Source/cmVS141CSharpFlagTable.h
index 85085817c5..5de9bf33fb 100644
--- a/Source/cmVS141CSharpFlagTable.h
+++ b/Source/cmVS141CSharpFlagTable.h
@@ -25,7 +25,8 @@ static cmVS7FlagTable cmVS141CSharpFlagTable[] = {
   { "ApplicationIcon", "win32icon", "", "",
     cmIDEFlagTable::UserValueRequired },
 
-  { "Win32Manifest", "win32manifest:", "", "true", 0 },
+  { "ApplicationManifest", "win32manifest:", "", "",
+    cmIDEFlagTable::UserValueRequired },
 
   { "NoWin32Manifest", "nowin32manifest", "", "true", 0 },
 
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 5a674770ab..d689dcfba0 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -2340,6 +2340,12 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
       clOptions.AddFlag("CallingConvention", "");
     }
   }
+  if (csproj == this->ProjectType) {
+    // /nowin32manifest overrides /win32manifest: parameter
+    if (clOptions.HasFlag("NoWin32Manifest")) {
+      clOptions.RemoveFlag("ApplicationManifest");
+    }
+  }
 
   this->ClOptions[configName] = pOptions.release();
   return true;