diff --git a/res/dpiaware.manifest b/res/dpiaware.manifest
new file mode 100644
index 000000000..5de107ba5
--- /dev/null
+++ b/res/dpiaware.manifest
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
+	<asmv3:application>
+		<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+			<dpiAware>true</dpiAware>
+		</asmv3:windowsSettings>
+	</asmv3:application>
+</assembly>
\ No newline at end of file
diff --git a/src/cmd/synergyc/CMakeLists.txt b/src/cmd/synergyc/CMakeLists.txt
index 11d428d44..922ee324b 100644
--- a/src/cmd/synergyc/CMakeLists.txt
+++ b/src/cmd/synergyc/CMakeLists.txt
@@ -60,6 +60,15 @@ add_executable(synergyc ${sources})
 target_link_libraries(synergyc
 	arch base client common io mt net ipc platform server synergy ${libs})
 
+if (WIN32)
+	ADD_CUSTOM_COMMAND(
+		TARGET synergyc
+		POST_BUILD
+		COMMAND "mt.exe" -manifest \"${CMAKE_SOURCE_DIR}\\res\\dpiaware.manifest\" -inputresource:\"$<TARGET_FILE:synergyc>\"\;\#1 -outputresource:\"$<TARGET_FILE:synergyc>\"\;\#1
+		COMMENT "Adding display aware manifest..."
+	)
+endif()
+
 if (CONF_CPACK)
 	install(TARGETS
 		synergyc
diff --git a/src/cmd/synergyd/CMakeLists.txt b/src/cmd/synergyd/CMakeLists.txt
index 1caa35b52..49a6a7f87 100644
--- a/src/cmd/synergyd/CMakeLists.txt
+++ b/src/cmd/synergyd/CMakeLists.txt
@@ -37,6 +37,15 @@ endif()
 target_link_libraries(synergyd
 	arch base common io ipc mt net platform synergy ${libs})
 
+if (WIN32)
+	ADD_CUSTOM_COMMAND(
+		TARGET synergyd
+		POST_BUILD
+		COMMAND "mt.exe" -manifest \"${CMAKE_SOURCE_DIR}\\res\\dpiaware.manifest\" -inputresource:\"$<TARGET_FILE:synergyd>\"\;\#1 -outputresource:\"$<TARGET_FILE:synergyd>\"\;\#1
+		COMMENT "Adding display aware manifest..."
+	)
+endif()
+
 if (CONF_CPACK)
 	install(TARGETS
 		synergyd
diff --git a/src/cmd/synergys/CMakeLists.txt b/src/cmd/synergys/CMakeLists.txt
index c749e09a8..3e2faad1a 100644
--- a/src/cmd/synergys/CMakeLists.txt
+++ b/src/cmd/synergys/CMakeLists.txt
@@ -60,6 +60,15 @@ add_executable(synergys ${sources})
 target_link_libraries(synergys
 	arch base client common io mt net ipc platform server synergy ${libs})
 
+if (WIN32)
+	ADD_CUSTOM_COMMAND(
+		TARGET synergys
+		POST_BUILD
+		COMMAND "mt.exe" -manifest \"${CMAKE_SOURCE_DIR}\\res\\dpiaware.manifest\" -inputresource:\"$<TARGET_FILE:synergys>\"\;\#1 -outputresource:\"$<TARGET_FILE:synergys>\"\;\#1
+		COMMENT "Adding display aware manifest..."
+	)
+endif()
+
 if (CONF_CPACK)
 	install(TARGETS
 		synergys