diff --git a/engine/premake5.lua b/engine/premake5.lua
index 898f686..4d33e2d 100644
--- a/engine/premake5.lua
+++ b/engine/premake5.lua
@@ -204,6 +204,13 @@ function gf_link_stuffs(cond)
 end
 
 function gf_msvc_filters()
+	-- Manifest fix by penguin2233
+	require('vstudio')
+	premake.override(premake.vstudio.vc200x, "generateManifest", function(base, cfg, toolset)
+		if cfg.flags.NoManifest then
+			premake.w('GenerateManifest="false"')
+		end
+	end)
 	filter({})
 	characterset("MBCS")
 	for k,rt in ipairs({"Debug", "Release"}) do
@@ -212,12 +219,8 @@ function gf_msvc_filters()
 			"options:engine=dynamic",
 			"configurations:" .. rt
 		})
-		linkoptions({"/MANIFEST"})
 		runtime(rt)
 		staticruntime("Off")
-		postbuildcommands({
-			"mt -manifest $(TargetDir)$(TargetName).dll.manifest -outputresource:$(TargetDir)$(TargetName).dll"
-		})
 	filter({
 			"options:cc=msc",
 			"options:engine=static",
diff --git a/premake5.lua b/premake5.lua
index 1981262..cac3c8a 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -36,6 +36,13 @@ newaction({
 })
 
 function msvc_filters()
+	-- Manifest fix by penguin2233
+	require('vstudio')
+	premake.override(premake.vstudio.vc200x, "generateManifest", function(base, cfg, toolset)
+		if cfg.flags.NoManifest then
+			premake.w('GenerateManifest="false"')
+		end
+	end)
 	filter({})
 	characterset("MBCS")
 	for k,rt in ipairs({"Debug", "Release"}) do
@@ -44,7 +51,6 @@ function msvc_filters()
 			"options:engine=dynamic",
 			"configurations:" .. rt
 		})
-		linkoptions({"/MANIFEST"})
 		runtime(rt)
 		staticruntime("Off")
 	filter({
@@ -52,14 +58,9 @@ function msvc_filters()
 			"options:engine=static",
 			"configurations:" .. rt
 		})
-		linkoptions({"/MANIFEST"})
 		runtime(rt)
 		staticruntime("On")
 	end
-	filter("options:cc=msc")
-		postbuildcommands({
-			"mt -manifest $(TargetDir)$(TargetName).exe.manifest -outputresource:$(TargetDir)$(TargetName).exe"
-		})
 	filter({})
 end