diff --git a/cmake/libusb-1.0.21-win.7z b/cmake/libusb-1.0.21-win.7z
new file mode 100644
index 0000000..c939525
--- /dev/null
+++ b/cmake/libusb-1.0.21-win.7z
diff --git a/cmake/libusb_on_windows.cmake b/cmake/libusb_on_windows.cmake
index 4998f23..67beb78 100644
--- a/cmake/libusb_on_windows.cmake
+++ b/cmake/libusb_on_windows.cmake
@@ -1,23 +1,27 @@
-message("Download libusb1.0")
-if (NOT EXISTS "${CMAKE_BINARY_DIR}/libusb.7z")
-    file(DOWNLOAD "http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.20/libusb-1.0.20.7z?r=http%3A%2F%2Flibusb.info%2F&ts=1457005849&use_mirror=vorboss"
-    "${CMAKE_BINARY_DIR}/libusb.7z" )
-endif()
-
+#message("Download libusb1.0")
+#if (NOT EXISTS "${CMAKE_BINARY_DIR}/libusb.7z")
+#    file(DOWNLOAD "http://downloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.20/libusb-1.0.20.7z?r=http%3A%2F%2Flibusb.info%2F&ts=1457005849&use_mirror=vorboss"
+#    "${CMAKE_BINARY_DIR}/libusb.7z" )
+#endif()
 
-file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/libusb")
+set(filename "${CMAKE_CURRENT_LIST_DIR}/libusb-1.0.21-win.7z")
+set(LIBUSB_DIR "${CMAKE_BINARY_DIR}/libusb-1.0.21-win")
 
 execute_process(
-COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_BINARY_DIR}/libusb.7z
-WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/libusb"
+COMMAND ${CMAKE_COMMAND} -E tar xzf "${filename}"
+WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
 )
 
+set(ARCH "")
 if (CMAKE_SIZEOF_VOID_P EQUAL 4)
-    target_link_libraries(${PROJECT_NAME} "${CMAKE_BINARY_DIR}/libusb/MinGW32/static/libusb-1.0.a")
+    set(ARCH "32")
 elseif(CMAKE_SIZEOF_VOID_P EQUAL 8)
-    target_link_libraries(${PROJECT_NAME} "${CMAKE_BINARY_DIR}/libusb/MinGW64/static/libusb-1.0.a")
+    set(ARCH "64")
 else()
     message(FATAL_ERROR "Target architecture not known")
 endif()
 
-include_directories("${CMAKE_BINARY_DIR}/libusb/include" "${CMAKE_BINARY_DIR}/libusb/include/libusb-1.0")
+target_link_libraries(${PROJECT_NAME} "${LIBUSB_DIR}/${ARCH}/libusb-1.0.lib")
+file(COPY "${LIBUSB_DIR}/${ARCH}/libusb-1.0.dll" DESTINATION "${CMAKE_BINARY_DIR}")
+
+include_directories("${LIBUSB_DIR}" "${LIBUSB_DIR}/libusb-1.0")
diff --git a/openhantek/CMakeLists.txt b/openhantek/CMakeLists.txt
index bd6de96..71be371 100644
--- a/openhantek/CMakeLists.txt
+++ b/openhantek/CMakeLists.txt
@@ -23,7 +23,7 @@ add_subdirectory(res)
 add_definitions(-DVERSION="${CPACK_PACKAGE_VERSION}")
 
 # make executable
-add_executable(${PROJECT_NAME} ${SRC} ${HEADERS} ${QRC} ${TRANSLATION_BIN_FILES} ${TRANSLATION_QRC})
+add_executable(${PROJECT_NAME} ${SRC} ${HEADERS} ${QRC} ${TRANSLATION_BIN_FILES} ${TRANSLATION_QRC} ${VS_FIX_FILES})
 target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL ${OPENGL_LIBRARIES} )
 target_compile_features(${PROJECT_NAME} PRIVATE cxx_range_for)
 if(MSVC)