diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in
index 15607f7cf8..e18436cdf1 100644
--- a/cmake/modules/NSIS.template.in
+++ b/cmake/modules/NSIS.template.in
@@ -321,7 +321,8 @@ Section "${APPLICATION_NAME}" SEC_APPLICATION
    ;QtKeyChain stuff
    File "${MING_BIN}\libqtkeychain.dll"
 
-   File "${CSYNC_LIBRARY_DIR}/libocsync.dll"
+   File "${CSYNC_LIBRARY_DIR}\libocsync.dll"
+   File "${CSYNC_LIBRARY_DIR}\httpbf\libhttpbf.dll"
    File "${MING_BIN}\libsqlite3-0.dll"
    File "${MING_BIN}\libiniparser.dll"
    File "${MING_BIN}\libdl.dll"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e7bb0c07b4..3a9829e374 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -123,11 +123,11 @@ qt_wrap_cpp(syncMoc ${libsync_HEADERS})
 
 IF( DEFINED CSYNC_BUILD_PATH )
 IF(WIN32)
-SET(HTTPBF_LIBRARY ${CSYNC_BUILD_PATH}/src/httpbf/libhttpbflib.dll)
+SET(HTTPBF_LIBRARY ${CSYNC_BUILD_PATH}/src/httpbf/libhttpbf.dll)
 ELSEIF( APPLE )
-SET(HTTPBF_LIBRARY ${CSYNC_BUILD_PATH}/src/httpbf/libhttpbflib.a)
+SET(HTTPBF_LIBRARY ${CSYNC_BUILD_PATH}/src/httpbf/libhttpbf.dylib)
 ELSE()
-SET(HTTPBF_LIBRARY ${CSYNC_BUILD_PATH}/src/httpbf/libhttpbflib.a)
+SET(HTTPBF_LIBRARY ${CSYNC_BUILD_PATH}/src/httpbf/libhttpbf.so)
 ENDIF()
 ELSE()
 FIND_LIBRARY(HTTPBF_LIBRARY NAMES httpbflib HINTS $ENV{CSYNC_DIR})