diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 67993f4e0e..d53304936c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -989,3 +989,7 @@ if( CMAKE_COMPILER_IS_GNUCXX )
 		set_source_files_properties( x86.cpp PROPERTIES COMPILE_FLAGS "-msse2 -mmmx" )
 	endif( SSE_MATTERS )
 endif( CMAKE_COMPILER_IS_GNUCXX )
+
+if( MSVC )
+	set_target_properties(zdoom PROPERTIES LINK_FLAGS "/MANIFEST:NO")
+endif( MSVC )
diff --git a/wadsrc/CMakeLists.txt b/wadsrc/CMakeLists.txt
index a24d712e1b..4220525116 100644
--- a/wadsrc/CMakeLists.txt
+++ b/wadsrc/CMakeLists.txt
@@ -4,6 +4,7 @@ get_target_property(ZIPDIR_EXE zipdir LOCATION)
 
 add_custom_command( OUTPUT ${ZDOOM_OUTPUT_DIR}/zdoom.pk3
 	COMMAND ${ZIPDIR_EXE} -udf ${ZDOOM_OUTPUT_DIR}/zdoom.pk3 ${CMAKE_CURRENT_SOURCE_DIR}/static 
+	COMMAND ${CMAKE_COMMAND} -E copy_if_different ${ZDOOM_OUTPUT_DIR}/zdoom.pk3 $<TARGET_FILE_DIR:zdoom>
 	DEPENDS zipdir ${CMAKE_CURRENT_SOURCE_DIR}/static )
 
 add_custom_target( pk3 ALL