diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index f8399e1a7..63f1c27fb 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -14,8 +14,13 @@ set(MBELIB_TAG "lib")
 set(SERIALDV_TAG "v1.1.5")
 set(DSDCC_TAG "v1.9.6")
 set(LIMESUITE_TAG 524cd2e548b11084e6f739b2dfe0f958c2e30354)
-set(BLADERF_TAG 7d7d87f686ebedb29dba9f35c7313892ba286318)
-set(LIBIIO_TAG "v0.25")
+set(BLADERF_TAG "2024.05")
+if (WIN32)
+    # Using old version of libiio on windows, as we get unresolved symbols in dll: serial_create_context_from_uri
+    set(LIBIIO_TAG 826563e41b5ce9890b75506f672017de8d76d52d)
+else()
+    set(LIBIIO_TAG "v0.26")
+endif()
 set(AIRSPYHF_TAG "87cf12a30f3a0f10f313aab8e54999ca69b753af")
 set(PERSEUS_TAG afefa23e3140ac79d845acb68cf0beeb86d09028)
 set(MIRISDR_TAG "v2.0.0")
@@ -1460,7 +1465,7 @@ if (WIN32 OR APPLE)
             set(LIBXML2_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/libxml2/lib/libxml2.a" CACHE INTERNAL "")
         endif ()
         if (WIN32)
-            set(IIO_LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}/libusb-1.0)
+            set(IIO_LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}/)
         else ()
             set(IIO_LIBUSB_INCLUDE_DIR ${LIBUSB_INCLUDE_DIR}/..)
         endif ()