diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf1e3da83..c565cc0da 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,6 +389,7 @@ ENDIF(WIN32)
 ADD_SUBDIRECTORY(plugins)
 ADD_SUBDIRECTORY(data)
 
+
 #
 # build LMMS-binary
 #
@@ -447,6 +448,14 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/3rdparty/samplerate/samplerate.h DESTINATI
 ENDIF(NOT LMMS_HAVE_SAMPLERATE)
 ENDIF(LMMS_BUILD_LINUX)
 
+# package ZynAddSubFX into win32 build
+IF(LMMS_BUILD_WIN32)
+IF(EXISTS ${CMAKE_SOURCE_DIR}/extras)
+ADD_SUBDIRECTORY(${CMAKE_SOURCE_DIR}/extras/data/presets)
+FILE(GLOB ZASF_BINARIES ${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/zynaddsubfx.dll ${CMAKE_SOURCE_DIR}/extras/plugins/zynaddsubfx/remote_zynaddsubfx.exe)
+INSTALL(FILES ${ZASF_BINARIES} DESTINATION ${PLUGIN_DIR})
+ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/extras)
+ENDIF(LMMS_BUILD_WIN32)
 
 #
 # add distclean-target
diff --git a/ChangeLog b/ChangeLog
index 2d10a2e45..1e5553b08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-09-22	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* CMakeLists.txt:
+	package ZynAddSubFX into win32 build
+
+	* plugins/vst_base/remote_vst_plugin.cpp:
+	* include/remote_plugin.h:
+	made remotePluginClient::process() have no return value
+
 	* src/core/main.cpp:
 	* data/locale/CMakeLists.txt:
 	install and load Qt translation files on win32