diff --git a/CMakeLists.txt b/CMakeLists.txt
index 790008adc..b4d4734ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,7 @@ ENDIF(LMMS_HOST_X86_64)
 OPTION(WANT_ALSA	"Include ALSA (Advanced Linux Sound Architecture) support" ON)
 OPTION(WANT_CAPS	"Include C* Audio Plugin Suite (LADSPA plugins)" ON)
 OPTION(WANT_CMT		"Include Computer Music Toolkit LADSPA plugins" ON)
-OPTION(WANT_FFTW3F	"Include SpectrumAnalyzer plugin" ON)
+OPTION(WANT_FFTW3F	"Include SpectrumAnalyzer and ZynAddSubFX plugin" ON)
 OPTION(WANT_JACK	"Include JACK (Jack Audio Connection Kit) support" ON)
 OPTION(WANT_OGGVORBIS	"Include OGG/Vorbis support" ON)
 OPTION(WANT_PULSEAUDIO	"Include PulseAudio support" ON)
@@ -657,6 +657,7 @@ MESSAGE(
 "* TAP LADSPA plugins          : ${STATUS_TAP}\n"
 "* SWH LADSPA plugins          : ${STATUS_SWH}\n"
 "* FL .zip import              : ${STATUS_ZIP}\n"
+"* ZynAddSubFX                 : ${STATUS_FFTW3F}\n"
 )
 
 MESSAGE(
diff --git a/ChangeLog b/ChangeLog
index 3a7566224..7d1ad74bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-02-24	Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
+
+	* CMakeLists.txt:
+	* data/presets/CMakeLists.txt:
+	* plugins/CMakeLists.txt:
+	* plugins/zynaddsubfx/zynaddsubfx.cpp:
+	* plugins/zynaddsubfx/CMakeLists.txt:
+	integrated ZynAddSubFX plugin from LMMS-extras into LMMS mainline
+
 2009-02-23	Tobias Doerffel <tobydox/at/users/dot/sourceforge/dot/net>
 
 	* cmake/modules/FindSTK.cmake:
diff --git a/data/presets/CMakeLists.txt b/data/presets/CMakeLists.txt
index 79240a551..f72ecc4aa 100644
--- a/data/presets/CMakeLists.txt
+++ b/data/presets/CMakeLists.txt
@@ -1,4 +1,5 @@
 INCLUDE(InstallHelpers)
 
 INSTALL_DATA_SUBDIRS("presets" "*.xpf")
+INSTALL_DATA_SUBDIRS("presets" "*.xiz")
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 11f038c24..132524acf 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -23,3 +23,4 @@ ADD_SUBDIRECTORY(vestige)
 ADD_SUBDIRECTORY(vst_base)
 ADD_SUBDIRECTORY(vst_effect)
 ADD_SUBDIRECTORY(vibed)
+ADD_SUBDIRECTORY(zynaddsubfx)
diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index 31ccd748a..529f4a9bd 100644
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -1,3 +1,5 @@
+IF(LMMS_HAVE_FFTW3F)
+
 INCLUDE(BuildPlugin)
 
 BUILD_PLUGIN(zynaddsubfx zynaddsubfx.cpp zynaddsubfx.h MOCFILES zynaddsubfx.h EMBEDDED_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.png)
@@ -130,4 +132,5 @@ ENDIF(LMMS_BUILD_WIN64)
 ADD_CUSTOM_TARGET(libfltk COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/fltk && cd ${CMAKE_CURRENT_BINARY_DIR}/fltk && ${CMAKE_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR}/fltk ${FLTK_EXTRA_FLAGS} -DFLTK_USE_SYSTEM_ZLIB:BOOL=ON -DFLTK_USE_SYSTEM_JPEG:BOOL=ON -DFLTK_USE_SYSTEM_PNG:BOOL=ON -DUSE_OPENGL:BOOL=OFF -DBUILD_TESTING:BOOL=OFF -DCMAKE_BUILD_TYPE=release && ${CMAKE_BUILD_TOOL})
 
 ADD_DEPENDENCIES(remote_zynaddsubfx libfltk)
+ENDIF(LMMS_HAVE_FFTW3F)
 
diff --git a/plugins/zynaddsubfx/zynaddsubfx.cpp b/plugins/zynaddsubfx/zynaddsubfx.cpp
index 826ec8430..9b2527b45 100644
--- a/plugins/zynaddsubfx/zynaddsubfx.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx.cpp
@@ -1,7 +1,7 @@
 /*
  * zynaddsubfx.cpp - ZynAddSubFX-embedding plugin
  *
- * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2008-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -23,7 +23,7 @@
  */
 
 
-#include <config.h>
+#include "lmmsconfig.h"
 
 #include <Qt/QtXml>
 #include <QtCore/QTemporaryFile>