diff --git a/Makefile b/Makefile
index 1530b50..5d1031d 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,7 @@ INCDIR=include
 CXX=cl /nologo
 LD=link /nologo
 CXXFLAGS=/c /O1 /I$(INCDIR) /W4 /Zi /DWIN32_LEAN_AND_MEAN /DWINVER=0x0501 /D_WIN32_WINNT=0x0501 /DUNICODE /D_UNICODE
-LDFLAGS=/subsystem:windows /debug /manifest /incremental:no /opt:REF
-LDFLAGS=$(LDFLAGS) "/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'"
+LDFLAGS=/subsystem:windows /debug /incremental:no /opt:REF
 RC=rc /nologo
 RCFLAGS=/i$(INCDIR)
 LIBS=
@@ -54,4 +53,3 @@ $(OUTDIR)\keyboard.res: keyboard.rc
 
 $(DISTDIR)\Keyboard.exe: $(FILES)
 	$(LD) /out:$@ $(LDFLAGS) $** $(LIBS)
-	mt.exe -nologo -manifest $@.manifest -outputresource:$@;1 && del $@.manifest || set ERRORLEVEL=0
diff --git a/commctrl6.manifest b/commctrl6.manifest
new file mode 100644
index 0000000..ec8d6dd
--- /dev/null
+++ b/commctrl6.manifest
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel level='asInvoker' uiAccess='false' />
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+  <dependency>
+    <dependentAssembly>
+      <assemblyIdentity type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*' />
+    </dependentAssembly>
+  </dependency>
+</assembly>
diff --git a/keyboard.rc b/keyboard.rc
index 06cf7a2..8beff46 100644
--- a/keyboard.rc
+++ b/keyboard.rc
@@ -2,6 +2,7 @@
 #include <winnls.h>
 
 RID_ICON ICON keyboard.ico
+1 24 commctrl6.manifest
 
 STRINGTABLE LANGUAGE 0x09, 0x01 // en-US
 BEGIN