diff --git a/CMakeLists.txt b/CMakeLists.txt
index b114b9f44b2..4e8d0ce46eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -982,13 +982,20 @@ IF(OPENSSL_FOUND)
 ENDIF()
 GET_PROPERTY(tmp_includes TARGET ab PROPERTY INCLUDE_DIRECTORIES)
 
-# getting duplicate manifest error with ApacheMonitor
-# ADD_EXECUTABLE(ApacheMonitor support/win32/ApacheMonitor.c support/win32/ApacheMonitor.rc)
-# SET(install_targets ${install_targets} ApacheMonitor)
-# SET(install_bin_pdb ${install_bin_pdb} $<TARGET_PDB_FILE:ApacheMonitor>)
-# SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES WIN32_EXECUTABLE TRUE)
-# SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES COMPILE_FLAGS "-DAPP_FILE -DLONG_NAME=ApacheMonitor -DBIN_NAME=ApacheMonitor.exe ${EXTRA_COMPILE_FLAGS}")
-# TARGET_LINK_LIBRARIES(ApacheMonitor ${EXTRA_LIBS} ${HTTPD_SYSTEM_LIBS} comctl32 wtsapi32)
+ADD_EXECUTABLE(ApacheMonitor support/win32/ApacheMonitor.c support/win32/ApacheMonitor.rc)
+SET(install_targets ${install_targets} ApacheMonitor)
+SET(install_bin_pdb ${install_bin_pdb} $<TARGET_PDB_FILE:ApacheMonitor>)
+SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES WIN32_EXECUTABLE TRUE)
+SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES COMPILE_FLAGS "-DAPP_FILE -DLONG_NAME=ApacheMonitor -DBIN_NAME=ApacheMonitor.exe ${EXTRA_COMPILE_FLAGS}")
+SET_TARGET_PROPERTIES(ApacheMonitor PROPERTIES LINK_FLAGS "/MANIFEST:NO") # do not emit intermediate manifest
+TARGET_LINK_LIBRARIES(ApacheMonitor ${EXTRA_LIBS} ${HTTPD_SYSTEM_LIBS} comctl32 wtsapi32)
+
+ADD_EXECUTABLE(wintty support/win32/wintty.c build/win32/httpd.rc)
+SET(install_targets ${install_targets} wintty)
+SET(install_bin_pdb ${install_bin_pdb} $<TARGET_PDB_FILE:wintty>)
+SET_TARGET_PROPERTIES(wintty PROPERTIES COMPILE_FLAGS "-DAPP_FILE -DLONG_NAME=wintty -DBIN_NAME=wintty.exe ${EXTRA_COMPILE_FLAGS}")
+TARGET_LINK_LIBRARIES(wintty ${EXTRA_LIBS} ${HTTPD_SYSTEM_LIBS})
+
 
 ###########  CONFIGURATION FILES ###########
 # Set up variables used in the .conf file templates