diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4613ae76..eb3a63e30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,13 +21,15 @@ set (Boost_ADDITIONAL_VERSIONS "1.37.0" )
 if(WIN32 AND NOT UNIX)
 	find_package(Boost 1.42.0 REQUIRED ${BOOST_LIBS} )
 	if (Boost_FOUND)
-		add_definitions (-DHAVE_BOOST)
-		set (BOOST_LINK_LIBS 
-			${Boost_LIBRARIES})
+		add_definitions (
+			-DHAVE_BOOST
+			)
+		#set (BOOST_LINK_LIBS 
+		#	${Boost_LIBRARIES})
 		include_directories (${Boost_INCLUDE_DIRS})
-		link_directories(${Boost_INCLUDE_DIRS})
-		message(STATUS "Boost includes: " ${Boost_INCLUDE_DIRS})
-		message(STATUS "Boost libs: " ${Boost_LIBRARIES})
+		link_directories(${Boost_LIBRARY_DIRS})
+		#message(STATUS "Boost includes: " ${Boost_INCLUDE_DIRS})
+		#message(STATUS "Boost libs: " ${Boost_LIBRARIES})
 	else (Boost_FOUND)
 		set (BOOST_LINK_LIBS
 			boost_system
diff --git a/src/contrib/flacdecoder/CMakeLists.txt b/src/contrib/flacdecoder/CMakeLists.txt
index eb34d5d41..2e57aea62 100644
--- a/src/contrib/flacdecoder/CMakeLists.txt
+++ b/src/contrib/flacdecoder/CMakeLists.txt
@@ -33,6 +33,6 @@ else (flac_found)
 	endif (${MSVC90})
 endif (flac_found)
 add_library( flacdecoder SHARED ${flacdecoder_SOURCES} )
-target_link_libraries( flacdecoder ${musikCube_LINK_LIBS} FLAC++)
+target_link_libraries( flacdecoder ${musikCube_LINK_LIBS} FLAC FLAC++)
 
 
diff --git a/src/contrib/flacdecoder/lib/VS2008/FLAC.dll b/src/contrib/flacdecoder/lib/VS2008/FLAC.dll
new file mode 100644
index 000000000..9421e65d1
Binary files /dev/null and b/src/contrib/flacdecoder/lib/VS2008/FLAC.dll differ
diff --git a/src/contrib/flacdecoder/lib/VS2008/FLAC.exp b/src/contrib/flacdecoder/lib/VS2008/FLAC.exp
new file mode 100644
index 000000000..9df96a0bf
Binary files /dev/null and b/src/contrib/flacdecoder/lib/VS2008/FLAC.exp differ
diff --git a/src/contrib/flacdecoder/lib/VS2008/FLAC.lib b/src/contrib/flacdecoder/lib/VS2008/FLAC.lib
new file mode 100644
index 000000000..146f1b4a0
Binary files /dev/null and b/src/contrib/flacdecoder/lib/VS2008/FLAC.lib differ