diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ebefd1d..0713a02 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -54,6 +54,9 @@ jobs:
         with:
           version: ${{ matrix.qt_version }}
 
+      - name: Setup MSVC environment for QMake
+        uses: ilammy/msvc-dev-cmd@v1
+
       - name: Build library with CMake
         run: |
           cmake . ${{ matrix.additional_arguments }}
@@ -83,9 +86,6 @@ jobs:
           cmake . ${{ matrix.additional_arguments }}
           cmake --build .
 
-      - name: Setup MSVC environment for QMake
-        uses: ilammy/msvc-dev-cmd@v1
-
       - name: Build basic example with QMake
         working-directory: examples/basic/
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f8b70a..b9e6efb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.4.1
+
+* Improved Windows advapi32 link library dependency. - _Frederik Seiffert_
+
 ## 3.4.0
 
 * Provide API for blocking sendMessage. - _Christoph Cullmann_
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 174d56c..c9771e1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,7 +38,9 @@ endif()
 target_link_libraries(${PROJECT_NAME} PUBLIC ${QT_LIBRARIES})
 
 if(WIN32)
-    target_link_libraries(${PROJECT_NAME} PRIVATE advapi32)
+    find_library(advapi32_LIBRARY advapi32 REQUIRED)
+    mark_as_advanced(advapi32_LIBRARY)
+    target_link_libraries(${PROJECT_NAME} PRIVATE ${advapi32_LIBRARY})
 endif()
 
 target_compile_definitions(${PROJECT_NAME} PUBLIC QAPPLICATION_CLASS=${QAPPLICATION_CLASS})