diff --git a/icinga-app/CMakeLists.txt b/icinga-app/CMakeLists.txt
index ef71ad999..83e8e1a6a 100644
--- a/icinga-app/CMakeLists.txt
+++ b/icinga-app/CMakeLists.txt
@@ -76,6 +76,20 @@ set_target_properties (
   OUTPUT_NAME icinga2
 )
 
+# Amend manifest to tell Windows that the application is DPI aware (needed for Windows 8.1 and up)
+if(MSVC)
+  if(CMAKE_MAJOR_VERSION LESS 3)
+    MESSAGE(WARNING "CMake version 3.0 or newer is required use build variable TARGET_FILE")
+  else()
+    ADD_CUSTOM_COMMAND(
+      TARGET ${TARGET_TARGETNAME}
+      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
+      COMMENT "Adding OS version detection manifest..."
+    )
+  endif()
+endif(MSVC)
+
 if(WIN32)
   set(InstallPath "${CMAKE_INSTALL_SBINDIR}")
 else()