diff --git a/cmake/EthExecutableHelper.cmake b/cmake/EthExecutableHelper.cmake
index 0c2f72946..0c529881f 100644
--- a/cmake/EthExecutableHelper.cmake
+++ b/cmake/EthExecutableHelper.cmake
@@ -90,15 +90,20 @@ macro(eth_install_executable EXECUTABLE)
 			" COMPONENT RUNTIME )
 
 	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-			COMMAND cmd /C "set PATH=${Qt5Core_DIR}/../../../bin;%PATH% && ${WINDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.exe ${eth_qml_dir}"
-			WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-		)
-		#workaround for https://bugreports.qt.io/browse/QTBUG-42083
-		add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
-			COMMAND cmd /C "(echo [Paths] & echo.Prefix=.)" > "qt.conf"
-			WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} VERBATIM
-		)
+
+		get_target_property(TARGET_LIBS ${EXECUTABLE} INTERFACE_LINK_LIBRARIES)
+		string(REGEX MATCH "Qt5::Core" HAVE_QT ${TARGET_LIBS})
+		if ("${HAVE_QT}" STREQUAL "Qt5::Core")
+			add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
+				COMMAND cmd /C "set PATH=${Qt5Core_DIR}/../../../bin;%PATH% && ${WINDEPLOYQT_APP} ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${EXECUTABLE}.exe ${eth_qml_dir}"
+				WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+			)
+			#workaround for https://bugreports.qt.io/browse/QTBUG-42083
+			add_custom_command(TARGET ${EXECUTABLE} POST_BUILD
+				COMMAND cmd /C "(echo [Paths] & echo.Prefix=.)" > "qt.conf"
+				WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR} VERBATIM
+			)
+		endif()
 
 		#copy additional dlls
 		foreach(dll ${ETH_INSTALL_EXECUTABLE_DLLS})
diff --git a/eth/CMakeLists.txt b/eth/CMakeLists.txt
index ed65862a4..bc458a50f 100644
--- a/eth/CMakeLists.txt
+++ b/eth/CMakeLists.txt
@@ -28,5 +28,9 @@ endif()
 target_link_libraries(${EXECUTABLE} webthree)
 target_link_libraries(${EXECUTABLE} secp256k1)
 
+if (WIN32)
+	add_custom_command(TARGET ${EXECUTABLE} POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy ${MHD_DLL_RELEASE} "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}")
+endif()
+
 install( TARGETS ${EXECUTABLE} DESTINATION bin )