diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt
index 83e8e1a6a..2ebfb17dd 100644
--- a/icinga-app/CMakeLists.txt
+++ b/icinga-app/CMakeLists.txt
@@ -82,9 +82,9 @@ if(MSVC)
     MESSAGE(WARNING "CMake version 3.0 or newer is required use build variable TARGET_FILE")
   else()
     ADD_CUSTOM_COMMAND(
-      TARGET ${TARGET_TARGETNAME}
+      TARGET icinga-app
       POST_BUILD
-      COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\agent\\windows-setup-agent\\app.manifest\" -inputresource:\"$<TARGET_FILE:${TARGET_TARGETNAME}>\"\;\#1 -outputresource:\"$<TARGET_FILE:${TARGET_TARGETNAME}>\"\;\#1
+      COMMAND "mt.exe" -manifest \"${CMAKE_CURRENT_SOURCE_DIR}\\app.manifest\" -outputresource:\"icinga2\"\;\#1
       COMMENT "Adding OS version detection manifest..."
     )
   endif()
diff --git a/icinga-app/app.manifest b/icinga-app/app.manifest
new file mode 100644
index 000000000..cf5cb1f13
--- /dev/null
+++ b/icinga-app/app.manifest
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of all Windows versions that this application is designed to work with. 
+      Windows will automatically select the most compatible environment.-->
+      <!-- Windows 10 -->
+      <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+      <!-- Windows 8.1 -->
+      <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+      <!-- Windows 8 -->
+      <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+
+    </application>
+  </compatibility>
+
+</asmv1:assembly>