diff --git a/telldus-core/CMakeLists.txt b/telldus-core/CMakeLists.txt
index a7836523..7c521f52 100644
--- a/telldus-core/CMakeLists.txt
+++ b/telldus-core/CMakeLists.txt
@@ -52,6 +52,9 @@ ADD_SUBDIRECTORY(service)
 ADD_SUBDIRECTORY(client)
 
 IF(BUILD_TDTOOL)
+	IF(WIN32)
+		ADD_SUBDIRECTORY(3rdparty/openbsd-getopt)
+	ENDIF()
 	ADD_SUBDIRECTORY(tdtool)
 ENDIF(BUILD_TDTOOL)
 IF(BUILD_TDADMIN)
diff --git a/telldus-core/tdtool/CMakeLists.txt b/telldus-core/tdtool/CMakeLists.txt
index c94f703f..2bf324a4 100644
--- a/telldus-core/tdtool/CMakeLists.txt
+++ b/telldus-core/tdtool/CMakeLists.txt
@@ -22,9 +22,12 @@ INCLUDE_DIRECTORIES(
 ADD_DEFINITIONS( -DVERSION="${DISPLAYED_VERSION}" )
 
 IF (WIN32)
-	FIND_LIBRARY(TELLDUSCORE_LIBRARY TelldusCore)
 	TARGET_LINK_LIBRARIES(tdtool
-		${TELLDUSCORE_LIBRARY}
+		TelldusCore
+		openbsd-getopt
+	)
+	INCLUDE_DIRECTORIES(
+		${CMAKE_SOURCE_DIR}/3rdparty/openbsd-getopt
 	)
 ELSEIF (APPLE)
 	TARGET_LINK_LIBRARIES(tdtool