diff --git a/CMakeLists.txt b/CMakeLists.txt
index b09569131..344574fb2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -403,10 +403,13 @@ ENDFOREACH(_item ${locale_targets})
 
 # install headers
 
+IF(LMMS_BUILD_LINUX)
 INSTALL(FILES ${lmms_INCLUDES} ${CMAKE_BINARY_DIR}/lmmsconfig.h ${CMAKE_SOURCE_DIR}/src/gui/embed.cpp DESTINATION ${CMAKE_INSTALL_PREFIX}/include/lmms/)
 IF(NOT LMMS_HAVE_SAMPLERATE)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/lmms/)
 ENDIF(NOT LMMS_HAVE_SAMPLERATE)
+ENDIF(LMMS_BUILD_LINUX)
+
 
 #
 # add distclean-target
diff --git a/ChangeLog b/ChangeLog
index ba1cfefc3..94ab07f3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 	* CMakeLists.txt:
 	made 0.4.0-rc1 release
 
+	* plugins/vst_base/CMakeLists.txt:
+	* CMakeLists.txt:
+	fixed win32-specific build issues
+
 	* include/gui_templates.h:
 	* src/core/instrument_sound_shaping.cpp:
 	* src/gui/widgets/instrument_sound_shaping_view.cpp:
diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
index 8d69c5b73..3cfdd1140 100644
--- a/plugins/vst_base/CMakeLists.txt
+++ b/plugins/vst_base/CMakeLists.txt
@@ -6,11 +6,11 @@ BUILD_PLUGIN(vstbase vst_base.cpp vst_plugin.cpp vst_plugin.h communication.h MO
 
 
 IF(LMMS_BUILD_WIN32)
-
-ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
-LINK_LIBRARIES(-lQtCore4 -lpthread -lgdi32 -lwsock32)
-ADD_EXECUTABLE(remote_vst_plugin ${CMAKE_CURRENT_SOURCE_DIR}/remote_vst_plugin.cpp)
-
+	ADD_DEFINITIONS(-DPTW32_STATIC_LIB)
+	LINK_LIBRARIES(-lQtCore4 -lpthread -lgdi32 -lwsock32)
+	ADD_EXECUTABLE(remote_vst_plugin ${CMAKE_CURRENT_SOURCE_DIR}/remote_vst_plugin.cpp)
+	ADD_CUSTOM_COMMAND(TARGET remote_vst_plugin POST_BUILD COMMAND /opt/mingw/bin/i586-mingw32-strip ${CMAKE_CURRENT_BINARY_DIR}/remote_vst_plugin.exe)
+	INSTALL(TARGETS remote_vst_plugin RUNTIME DESTINATION ${PLUGIN_DIR})
 ENDIF(LMMS_BUILD_WIN32)