From 4b8cf97af3fdc2b5b114a89c8311c9315e35803e Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Sun, 24 Apr 2016 18:52:43 +0200
Subject: [PATCH 01/10] Compile VST plugins without Wine

---
 CMakeLists.txt                  | 3 +++
 plugins/vst_base/CMakeLists.txt | 3 +++
 plugins/vst_base/VstPlugin.cpp  | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 917b38180..e099d3809 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -406,6 +406,9 @@ IF(WANT_VST)
 	IF(WINE_FOUND)
 		SET(LMMS_SUPPORT_VST TRUE)
 		SET(STATUS_VST "OK")
+	ELSEIF(WANT_VST_NOWINE)
+		SET(LMMS_SUPPORT_VST TRUE)
+		SET(STATUS_VST "OK")
 	ELSE(WINE_FOUND)
 		SET(STATUS_VST "not found, please install (lib)wine-dev (or similar) - 64 bit systems additionally need gcc-multilib and g++-multilib")
 	ENDIF(WINE_FOUND)
diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
index 18b944bc8..2d0629b52 100644
--- a/plugins/vst_base/CMakeLists.txt
+++ b/plugins/vst_base/CMakeLists.txt
@@ -24,6 +24,9 @@ IF(LMMS_BUILD_WIN32)
 	ENDIF(LMMS_BUILD_WIN64 AND NOT LMMS_BUILD_MSYS)
 ENDIF(LMMS_BUILD_WIN32)
 
+SET(REMOTE_VST_PLUGIN_FILEPATH "RemoteVstPlugin" CACHE STRING "Relative file path to RemoteVstPlugin")
+
+ADD_DEFINITIONS(-DREMOTE_VST_PLUGIN_FILEPATH="${REMOTE_VST_PLUGIN_FILEPATH}")
 IF(LMMS_BUILD_WIN32)
 	BUILD_PLUGIN(vstbase vst_base.cpp VstPlugin.cpp VstPlugin.h communication.h MOCFILES VstPlugin.h)
 ELSE()
diff --git a/plugins/vst_base/VstPlugin.cpp b/plugins/vst_base/VstPlugin.cpp
index 954b6196c..d21b230b9 100644
--- a/plugins/vst_base/VstPlugin.cpp
+++ b/plugins/vst_base/VstPlugin.cpp
@@ -99,7 +99,7 @@ VstPlugin::VstPlugin( const QString & _plugin ) :
 {
 	setSplittedChannels( true );
 
-	tryLoad( "RemoteVstPlugin" );
+	tryLoad( REMOTE_VST_PLUGIN_FILEPATH );
 #ifdef LMMS_BUILD_WIN64
 	if( m_badDllFormat )
 	{

From 1eda555e93620be4424a14efb5fd93f0d128368d Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Wed, 4 May 2016 18:35:36 +0200
Subject: [PATCH 02/10] Use fltk-config to avoid static library

---
 plugins/zynaddsubfx/CMakeLists.txt | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index 1fb8a61cd..95f0a5aed 100644
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -153,20 +153,23 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp "${WINRC}")
 INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}")
-SET(FLTK_FILTERED_LIBRARIES ${FLTK_LIBRARIES})
-LIST(REMOVE_ITEM FLTK_FILTERED_LIBRARIES "${X11_X11_LIB}" "${X11_Xext_LIB}")
-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LIBRARIES} -lpthread )
+
+# Remove useless dependencies from FLTK. Use fltk-config to avoid static library
+# in older environments
+SET(FLTK_FILTERED_LDFLAGS ${FLTK_LIBRARIES})
+FIND_PROGRAM(FLTK_CONFIG fltk-config)
+IF(FLTK_CONFIG AND NOT (LMMS_BUILD_APPLE OR LMMS_BUILD_WIN32))
+	EXECUTE_PROCESS(COMMAND ${FLTK_CONFIG} --ldflags OUTPUT_VARIABLE FLTK_FILTERED_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+	STRING(REPLACE " " ";" FLTK_FILTERED_LDFLAGS ${FLTK_FILTERED_LDFLAGS})
+	LIST(REMOVE_ITEM FLTK_FILTERED_LDFLAGS -lX11)
+ENDIF()
+TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} -lpthread )
 
 # link Qt libraries when on win32
 IF(LMMS_BUILD_WIN32)
 	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${QT_LIBRARIES})
 ENDIF(LMMS_BUILD_WIN32)
 
-# FLTK needs X (is libdl not linked in libfltk?)
-IF(LMMS_BUILD_LINUX)
-#	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx ${CMAKE_DL_LIBS})
-ENDIF(LMMS_BUILD_LINUX)
-
 
 IF(LMMS_BUILD_WIN32)
 	ADD_CUSTOM_COMMAND(TARGET ZynAddSubFxCore POST_BUILD COMMAND "${STRIP}" \"$<TARGET_FILE:ZynAddSubFxCore>\")

From 0196a67c7ccd2bbedf339013253837202bc6d93b Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Thu, 5 May 2016 00:59:05 +0200
Subject: [PATCH 03/10] Fixed ZynAddSubFxCore library issues

---
 plugins/zynaddsubfx/CMakeLists.txt | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index 95f0a5aed..9922f73cb 100644
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -117,7 +117,11 @@ SET(zynaddsubfx_core_SRCS
     )
 
 
-ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp ${zynaddsubfx_core_SRCS})
+IF(LMMS_BUILD_LINUX)
+	ADD_LIBRARY(ZynAddSubFxCore MODULE LocalZynAddSubFx.cpp ${zynaddsubfx_core_SRCS})
+ELSE()
+	ADD_LIBRARY(ZynAddSubFxCore SHARED LocalZynAddSubFx.cpp ${zynaddsubfx_core_SRCS})
+ENDIF()
 TARGET_LINK_LIBRARIES(ZynAddSubFxCore zynaddsubfx_nio ${FFTW3F_LIBRARIES} ${QT_LIBRARIES} -lz -lpthread)
 
 # required libs for debug msys builds
@@ -136,8 +140,14 @@ ELSE(LMMS_BUILD_WIN32)
 	INSTALL(TARGETS ZynAddSubFxCore LIBRARY DESTINATION "${PLUGIN_DIR}")
 ENDIF(LMMS_BUILD_WIN32)
 
+IF(LMMS_BUILD_LINUX)
+	LINK_LIBRARIES(ZynAddSubFxCore -Wl,--enable-new-dtags)
+ENDIF()
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 BUILD_PLUGIN(zynaddsubfx ZynAddSubFx.cpp ZynAddSubFx.h MOCFILES ZynAddSubFx.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
-TARGET_LINK_LIBRARIES(zynaddsubfx ZynAddSubFxCore)
+IF(NOT LMMS_BUILD_LINUX)
+	TARGET_LINK_LIBRARIES(zynaddsubfx ZynAddSubFxCore)
+ENDIF()
 
 IF(WIN32)
 	SET(WINRC "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj")
@@ -163,7 +173,11 @@ IF(FLTK_CONFIG AND NOT (LMMS_BUILD_APPLE OR LMMS_BUILD_WIN32))
 	STRING(REPLACE " " ";" FLTK_FILTERED_LDFLAGS ${FLTK_FILTERED_LDFLAGS})
 	LIST(REMOVE_ITEM FLTK_FILTERED_LDFLAGS -lX11)
 ENDIF()
-TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} -lpthread )
+IF(LMMS_BUILD_LINUX)
+	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ${FLTK_FILTERED_LDFLAGS} -lpthread )
+ELSE()
+	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} -lpthread )
+ENDIF()
 
 # link Qt libraries when on win32
 IF(LMMS_BUILD_WIN32)

From c94d6e8db4d670c2dda2ca13589b83dad1ae678d Mon Sep 17 00:00:00 2001
From: grejppi <grejppi@gmail.com>
Date: Thu, 5 May 2016 13:39:55 +0300
Subject: [PATCH 04/10] Add Quantize button to Piano Roll

Add Quantize button to Piano Roll
---
 include/PianoRoll.h           |  1 +
 src/gui/editors/PianoRoll.cpp | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/include/PianoRoll.h b/include/PianoRoll.h
index e874c802e..28f323def 100644
--- a/include/PianoRoll.h
+++ b/include/PianoRoll.h
@@ -181,6 +181,7 @@ protected slots:
 
 	void zoomingChanged();
 	void quantizeChanged();
+	void quantizeNotes();
 
 	void updateSemiToneMarkerMenu();
 
diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp
index 8fd7e0f10..3fafca3eb 100644
--- a/src/gui/editors/PianoRoll.cpp
+++ b/src/gui/editors/PianoRoll.cpp
@@ -3890,6 +3890,36 @@ int PianoRoll::quantization() const
 }
 
 
+void PianoRoll::quantizeNotes()
+{
+	NoteVector notes = getSelectedNotes();
+
+	if (notes.empty())
+	{
+		for (Note* n : m_pattern->notes())
+		{
+			notes.push_back(n);
+		}
+	}
+
+	for (Note* n : notes)
+	{
+		if (n->length() == MidiTime(0))
+		{
+			continue;
+		}
+
+		Note copy(*n);
+		m_pattern->removeNote(n);
+		copy.quantizePos(quantization());
+		m_pattern->addNote(copy);
+	}
+
+	update();
+	gui->songEditor()->update();
+}
+
+
 
 
 void PianoRoll::updateSemiToneMarkerMenu()
@@ -4047,10 +4077,15 @@ PianoRollWindow::PianoRollWindow() :
 
 	connect(editModeGroup, SIGNAL(triggered(int)), m_editor, SLOT(setEditMode(int)));
 
+	QAction* quantizeAction = new QAction(embed::getIconPixmap("quantize"), tr("Quantize"), this);
+	connect(quantizeAction, SIGNAL(triggered()), m_editor, SLOT(quantizeNotes()));
+
 	notesActionsToolBar->addAction( drawAction );
 	notesActionsToolBar->addAction( eraseAction );
 	notesActionsToolBar->addAction( selectAction );
 	notesActionsToolBar->addAction( detuneAction );
+	notesActionsToolBar->addSeparator();
+	notesActionsToolBar->addAction( quantizeAction );
 
 	// Copy + paste actions
 	DropToolBar *copyPasteActionsToolBar =  addDropToolBarToTop(tr("Copy paste controls"));

From 37c39e68a8703cfb14c9c7277c11ce294c65c424 Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Thu, 5 May 2016 23:03:46 +0200
Subject: [PATCH 05/10] Fixed link to module

---
 plugins/zynaddsubfx/CMakeLists.txt | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index 9922f73cb..e92386a5b 100644
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -141,13 +141,12 @@ ELSE(LMMS_BUILD_WIN32)
 ENDIF(LMMS_BUILD_WIN32)
 
 IF(LMMS_BUILD_LINUX)
-	LINK_LIBRARIES(ZynAddSubFxCore -Wl,--enable-new-dtags)
+	LINK_LIBRARIES(-Wl,--enable-new-dtags)
 ENDIF()
 SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 BUILD_PLUGIN(zynaddsubfx ZynAddSubFx.cpp ZynAddSubFx.h MOCFILES ZynAddSubFx.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
-IF(NOT LMMS_BUILD_LINUX)
-	TARGET_LINK_LIBRARIES(zynaddsubfx ZynAddSubFxCore)
-ENDIF()
+TARGET_LINK_LIBRARIES(zynaddsubfx -L.. -lZynAddSubFxCore)
+ADD_DEPENDENCIES(zynaddsubfx ZynAddSubFxCore)
 
 IF(WIN32)
 	SET(WINRC "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfxrc.obj")
@@ -173,11 +172,12 @@ IF(FLTK_CONFIG AND NOT (LMMS_BUILD_APPLE OR LMMS_BUILD_WIN32))
 	STRING(REPLACE " " ";" FLTK_FILTERED_LDFLAGS ${FLTK_FILTERED_LDFLAGS})
 	LIST(REMOVE_ITEM FLTK_FILTERED_LDFLAGS -lX11)
 ENDIF()
-IF(LMMS_BUILD_LINUX)
-	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ${FLTK_FILTERED_LDFLAGS} -lpthread )
-ELSE()
-	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui ZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} -lpthread )
-ENDIF()
+TARGET_LINK_LIBRARIES(RemoteZynAddSubFx zynaddsubfx_gui -L.. -lZynAddSubFxCore ${FLTK_FILTERED_LDFLAGS} -lpthread )
+ADD_DEPENDENCIES(RemoteZynAddSubFx ZynAddSubFxCore)
+
+IF(QT5)
+	TARGET_LINK_LIBRARIES(RemoteZynAddSubFx Qt5::Core)
+ENDIF(QT5)
 
 # link Qt libraries when on win32
 IF(LMMS_BUILD_WIN32)

From 6a0811b9a620b44a0dad1cc8cfc40812f9489f57 Mon Sep 17 00:00:00 2001
From: Daniel Winzen <d@winzen4.de>
Date: Fri, 6 May 2016 15:58:02 +0200
Subject: [PATCH 06/10] Fix warning issued by gcc-6.1

---
 plugins/stk/mallets/mallets.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/stk/mallets/mallets.cpp b/plugins/stk/mallets/mallets.cpp
index ae12036ab..7bfc5483a 100644
--- a/plugins/stk/mallets/mallets.cpp
+++ b/plugins/stk/mallets/mallets.cpp
@@ -202,7 +202,7 @@ void malletsInstrument::loadSettings( const QDomElement & _this )
 			default of 0.2. 0.2 * 128.0 = 25.6 	*/
 			m_vibratoGainModel.setValue( 25.6f );
 		}
-		if( ! m_presetsModel.value() == 1 )
+		if( m_presetsModel.value() != 1 )
 		{
 			// Frequency actually worked for Vibraphone!
 			m_vibratoFreqModel.setValue( 0.0f );

From e910d6f5a49b5faffe41d81cae259d6eca3940ac Mon Sep 17 00:00:00 2001
From: liushuyu <liushuyu011@gmail.com>
Date: Sat, 7 May 2016 16:42:56 +0800
Subject: [PATCH 07/10] Update i18n strings

---
 data/locale/en.ts | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/data/locale/en.ts b/data/locale/en.ts
index c879f15dc..1df16546f 100644
--- a/data/locale/en.ts
+++ b/data/locale/en.ts
@@ -5557,6 +5557,10 @@ PM means phase modulation: Oscillator 3&apos;s phase is modulated by oscillator
         <source>Piano-Roll - no pattern</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Quantize</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PianoView</name>
@@ -6436,6 +6440,25 @@ Remember to also save your project manually.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>SubWindow</name>
+    <message>
+        <source>Close</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Maximize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Minimize</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>TabWidget</name>
     <message>

From 7246c5749195697de8d9070d2e954ccb82579748 Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Sat, 7 May 2016 17:23:45 +0200
Subject: [PATCH 08/10] Allow execution of ZynAddSubFX and VST plugins from
 build tree

---
 plugins/VstEffect/CMakeLists.txt   |  7 ++++++-
 plugins/vestige/CMakeLists.txt     |  7 ++++++-
 plugins/vst_base/CMakeLists.txt    | 10 +++++-----
 plugins/zynaddsubfx/CMakeLists.txt | 11 ++++++++---
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/plugins/VstEffect/CMakeLists.txt b/plugins/VstEffect/CMakeLists.txt
index 804022f37..0b9c42c8d 100644
--- a/plugins/VstEffect/CMakeLists.txt
+++ b/plugins/VstEffect/CMakeLists.txt
@@ -7,7 +7,12 @@ IF(LMMS_BUILD_WIN32)
 ELSE()
 	LINK_LIBRARIES(vstbase -Wl,--enable-new-dtags)
 ENDIF()
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
+IF(LMMS_BUILD_LINUX)
+	SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+	SET(CMAKE_INSTALL_RPATH "$ORIGIN")
+ELSE()
+	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
+ENDIF()
 
 # Enable C++11
 ADD_DEFINITIONS(-std=c++0x)
diff --git a/plugins/vestige/CMakeLists.txt b/plugins/vestige/CMakeLists.txt
index 0c1c9c707..40e1b1ecd 100644
--- a/plugins/vestige/CMakeLists.txt
+++ b/plugins/vestige/CMakeLists.txt
@@ -5,7 +5,12 @@ IF(LMMS_SUPPORT_VST)
    INCLUDE(BuildPlugin)
    INCLUDE_DIRECTORIES("${CMAKE_CURRENT_SOURCE_DIR}/../vst_base")
    LINK_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}/..")
-   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
+   IF(LMMS_BUILD_LINUX)
+      SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+      SET(CMAKE_INSTALL_RPATH "$ORIGIN")
+   ELSE()
+      SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
+   ENDIF()
    IF(LMMS_BUILD_WIN32)
 	LINK_LIBRARIES(vstbase)
 	BUILD_PLUGIN(vestige vestige.cpp vestige.h MOCFILES vestige.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
diff --git a/plugins/vst_base/CMakeLists.txt b/plugins/vst_base/CMakeLists.txt
index 18b944bc8..ed5bf538c 100644
--- a/plugins/vst_base/CMakeLists.txt
+++ b/plugins/vst_base/CMakeLists.txt
@@ -45,14 +45,14 @@ ENDIF(LMMS_HOST_X86_64)
 ADD_CUSTOM_COMMAND(
 		SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp"
 		COMMAND ${WINE_CXX}
-		ARGS "-I\"${CMAKE_BINARY_DIR}\"" "-I\"${CMAKE_SOURCE_DIR}/include\"" "-I\"${CMAKE_INSTALL_PREFIX}/include/wine/windows\"" "-I\"${CMAKE_INSTALL_PREFIX}/include\"" -I/usr/include/wine/windows "\"${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp\"" -ansi -mwindows -lpthread ${EXTRA_FLAGS} -o RemoteVstPlugin
-		COMMAND find -name RemoteVstPlugin.exe -exec mv "'{}'" RemoteVstPlugin "';'"
+		ARGS "-I\"${CMAKE_BINARY_DIR}\"" "-I\"${CMAKE_SOURCE_DIR}/include\"" "-I\"${CMAKE_INSTALL_PREFIX}/include/wine/windows\"" "-I\"${CMAKE_INSTALL_PREFIX}/include\"" -I/usr/include/wine/windows "\"${CMAKE_CURRENT_SOURCE_DIR}/RemoteVstPlugin.cpp\"" -ansi -mwindows -lpthread ${EXTRA_FLAGS} -o ../RemoteVstPlugin
+		COMMAND sh -c "mv ../RemoteVstPlugin.exe ../RemoteVstPlugin || true"
 		TARGET vstbase
-		OUTPUTS RemoteVstPlugin
+		OUTPUTS ../RemoteVstPlugin
 		)
 
-SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES RemoteVstPlugin.exe.so)
-INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin" "${CMAKE_CURRENT_BINARY_DIR}/RemoteVstPlugin.exe.so" DESTINATION "${PLUGIN_DIR}")
+SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ../RemoteVstPlugin.exe.so)
+INSTALL(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin" "${CMAKE_CURRENT_BINARY_DIR}/../RemoteVstPlugin.exe.so" DESTINATION "${PLUGIN_DIR}")
 ENDIF(LMMS_BUILD_LINUX AND NOT WANT_VST_NOWINE)
 
 
diff --git a/plugins/zynaddsubfx/CMakeLists.txt b/plugins/zynaddsubfx/CMakeLists.txt
index e92386a5b..9520b59ee 100644
--- a/plugins/zynaddsubfx/CMakeLists.txt
+++ b/plugins/zynaddsubfx/CMakeLists.txt
@@ -142,8 +142,11 @@ ENDIF(LMMS_BUILD_WIN32)
 
 IF(LMMS_BUILD_LINUX)
 	LINK_LIBRARIES(-Wl,--enable-new-dtags)
+	SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+	SET(CMAKE_INSTALL_RPATH "$ORIGIN")
+ELSE()
+	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 ENDIF()
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
 BUILD_PLUGIN(zynaddsubfx ZynAddSubFx.cpp ZynAddSubFx.h MOCFILES ZynAddSubFx.h EMBEDDED_RESOURCES "${CMAKE_CURRENT_SOURCE_DIR}/*.png")
 TARGET_LINK_LIBRARIES(zynaddsubfx -L.. -lZynAddSubFxCore)
 ADD_DEPENDENCIES(zynaddsubfx ZynAddSubFxCore)
@@ -158,8 +161,10 @@ IF(WIN32)
 				DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/zynaddsubfx.rc")
 ENDIF(WIN32)
 
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+IF(NOT LMMS_BUILD_LINUX)
+	SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${PLUGIN_DIR}")
+	SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ENDIF()
 ADD_EXECUTABLE(RemoteZynAddSubFx RemoteZynAddSubFx.cpp "${WINRC}")
 INSTALL(TARGETS RemoteZynAddSubFx RUNTIME DESTINATION "${PLUGIN_DIR}")
 

From 8dd938463f4f691bceea879ef1ea800aa15b7a68 Mon Sep 17 00:00:00 2001
From: grejppi <grejppi@gmail.com>
Date: Mon, 9 May 2016 00:37:16 +0300
Subject: [PATCH 09/10] Remove Greippi-ardudar.mmpz (#2763)

---
 data/projects/Demos/Greippi-ardudar.mmpz | Bin 8826 -> 0 bytes
 data/projects/Demos/LICENSES.TXT         |   4 ----
 2 files changed, 4 deletions(-)
 delete mode 100644 data/projects/Demos/Greippi-ardudar.mmpz

diff --git a/data/projects/Demos/Greippi-ardudar.mmpz b/data/projects/Demos/Greippi-ardudar.mmpz
deleted file mode 100644
index 17ff90dfde4b5a3f20cbf4f912b9343745256668..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8826
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

diff --git a/data/projects/Demos/LICENSES.TXT b/data/projects/Demos/LICENSES.TXT
index db68441cd..8a24bede5 100644
--- a/data/projects/Demos/LICENSES.TXT
+++ b/data/projects/Demos/LICENSES.TXT
@@ -30,10 +30,6 @@
   - CC (by)
   - http://lmms.io/lsp/index.php?action=show&file=6337
 
-* Greippi-ardudar.mmpz
-  - CC (by-sa)
-  - http://lmms.io/lsp/index.php?action=show&file=4916
-
 * Impulslogik-Zen.mmpz
   - Artistic 2.0
   - http://lmms.io/lsp/index.php?action=show&file=581

From 3952def892380f264355ff949132fddb0bb72c16 Mon Sep 17 00:00:00 2001
From: Javier Serrano Polo <javier@jasp.net>
Date: Mon, 9 May 2016 01:45:21 +0200
Subject: [PATCH 10/10] Make clear that ZynAddSubFX is under GPL-2+

---
 plugins/zynaddsubfx/README.txt                               | 2 +-
 plugins/zynaddsubfx/zynaddsubfx/README.txt                   | 2 +-
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp     | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h             | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp    | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h      | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h             | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp     | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp   | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h     | 5 +++--
 .../zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp    | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h  | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h             | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp    | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h      | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp    | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h      | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp            | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h              | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp          | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h            | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp            | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h              | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp      | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp          | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h            | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp      | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp            | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h              | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp    | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h      | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h          | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp          | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h            | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp            | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h              | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp   | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h     | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp      | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp       | 2 +-
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h         | 2 +-
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h             | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp       | 2 +-
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h         | 2 +-
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h             | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h          | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h          | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h          | 5 +++--
 .../zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp   | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h | 5 +++--
 .../zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp  | 5 +++--
 .../zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h    | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp    | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h      | 5 +++--
 .../zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp    | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h  | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp  | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h    | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp     | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h       | 5 +++--
 .../zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp | 5 +++--
 .../zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h   | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp  | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h    | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp  | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h    | 5 +++--
 .../zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp | 5 +++--
 .../zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h   | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h           | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp            | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h              | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h          | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp      | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h          | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h        | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h   | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h   | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h     | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h      | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h         | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h      | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h       | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h   | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/globals.h                | 5 +++--
 plugins/zynaddsubfx/zynaddsubfx/src/main.cpp                 | 5 +++--
 133 files changed, 387 insertions(+), 260 deletions(-)

diff --git a/plugins/zynaddsubfx/README.txt b/plugins/zynaddsubfx/README.txt
index 44740a7dc..c7ae09ea8 100644
--- a/plugins/zynaddsubfx/README.txt
+++ b/plugins/zynaddsubfx/README.txt
@@ -3,7 +3,7 @@ ZynAddSubFX
 It is a realtime software synthesizer for Linux and Windows with many features. Please see the docs for details.
 Copyright (c) 2002-2009 Nasca Octavian Paul and others contributors
 e-mail: zynaddsubfx AT yahoo D0T com
-ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (and only version 2) - see the file COPYING.
+ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (or later) - see the file COPYING.
 
     --==## PLEASE SHARE YOUR INSTRUMENTS/MASTER SETTINGS ##==--
               --==## MADE WITH ZynAddSubFX ##==--
diff --git a/plugins/zynaddsubfx/zynaddsubfx/README.txt b/plugins/zynaddsubfx/zynaddsubfx/README.txt
index 76b56c6a4..366880c70 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/README.txt
+++ b/plugins/zynaddsubfx/zynaddsubfx/README.txt
@@ -3,7 +3,7 @@ ZynAddSubFX
 It is a realtime software synthesizer for Linux and Windows with many features. Please see the docs for details.
 Copyright (c) 2002-2014 Nasca Octavian Paul and others contributors
 e-mail: zynaddsubfx AT yahoo D0T com
-ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (and only version 2) - see the file COPYING.
+ZynAddSubFX is free program and is distributed WITH NO WARRANTY. It is licensed under GNU General Public License version 2 (or later) - see the file COPYING.
 
     --==## PLEASE SHARE YOUR INSTRUMENTS/MASTER SETTINGS ##==--
               --==## MADE WITH ZynAddSubFX ##==--
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp
index 58f46a213..a403df3a5 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.cpp
@@ -8,8 +8,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h
index 8a012d47d..99e7844b5 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/AnalogFilter.h
@@ -8,8 +8,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp
index 4d995b035..95641570c 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h
index 6eb603336..1d61e2e53 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FFTwrapper.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp
index 9487fb475..2e2a01816 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h
index 52e3675c1..c8e4ac863 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Filter.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp
index 36db5f6d1..06616002c 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h
index 715f00f03..fedd13da1 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/FormantFilter.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp
index 5e27c39c3..e7836a8b6 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h
index e9d002c7b..d5f720c2a 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/SVFilter.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp
index 540a7ef11..82880f16e 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h
index bca5ee859..c0fcf971a 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/DSP/Unison.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp
index fae1860b6..cc34038e9 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h
index 52019ac94..6f3ea8feb 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Alienwah.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp
index 7e95a2153..8fa2f73a4 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h
index 7772d4668..49c6157b9 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Chorus.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp
index 5d5c8f6f9..7fd2925ab 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h
index 9d577ddd8..60973db39 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Distorsion.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp
index 650a882be..948163631 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h
index 91d1f5e49..a5cd28868 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/DynamicFilter.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp
index e03fcef71..cfafce677 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h
index b2e9e89a9..f62aeb1f8 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EQ.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp
index 712f291da..b920660f6 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.cpp
@@ -8,8 +8,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h
index 4eb606b82..6e443e14d 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Echo.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp
index bc1c0b006..c8528ed37 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.cpp
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h
index d53bb9b71..f69e5f01e 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Effect.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp
index 1ec507a2f..4df2bc524 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h
index 82cbf87f7..fb80cf94e 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectLFO.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp
index 08d4f1d88..80e8185f3 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h
index 256a8d81d..fa58809e3 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/EffectMgr.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp
index 66a9283e3..b21c11b2b 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.cpp
@@ -15,8 +15,9 @@
   DSP analog modeling theory & practice largely influenced by various CCRMA publications, particularly works by Julius O. Smith.
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h
index 47961870d..b4edbc5fd 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Phaser.h
@@ -10,8 +10,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp
index 74961b2f5..07f2ea206 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h
index 5363759b6..8383efe97 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Effects/Reverb.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp
index a1f9f5d6b..5cb43e4ff 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.cpp
@@ -8,8 +8,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h
index 5a7ed9da2..e9f56e2fb 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Bank.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp
index d38c88bca..dc0280ec1 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h
index 1c875d87a..350561c46 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Config.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h
index a605a66b4..6cca23e3e 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Control.h
@@ -7,8 +7,9 @@
   Author: Harald Hvaal
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp
index e98074b40..32a01e025 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.cpp
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h
index dc543cf09..cd50512ba 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Dump.h
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp
index 57979a329..53398fefb 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.cpp
@@ -6,8 +6,9 @@
   Author: Lars Luthman
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h
index 1f3a49467..0ef700e65 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/LASHClient.h
@@ -6,8 +6,9 @@
   Author: Lars Luthman
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp
index c4b8947b8..c919eb563 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.cpp
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h
index 2238d7593..3726870a6 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Master.h
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp
index fc0e015e1..c503fef99 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h
index 638a1590f..d294285cf 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Microtonal.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp
index 184a0e238..ed61ff9af 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h
index ed247d30b..16ab88318 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Part.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
index 37d2c4597..9db281146 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.cpp
@@ -33,8 +33,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h
index 2a2e18931..7b5ca548c 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/QtXmlWrapper.h
@@ -33,8 +33,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp
index fede70104..a4e32634f 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h
index 0e3f02f10..4198648db 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Recorder.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp
index ac2f31727..89fcfd208 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.cpp
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h
index 516d31870..6a8764607 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Stereo.h
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp
index 9025c622a..b6b33dd5e 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h
index 0e67f0367..15fb479a3 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/Util.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp
index 78db9d52e..fde77be89 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.cpp
@@ -4,8 +4,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h
index 4b29efa02..497cee88e 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WavFile.h
@@ -7,8 +7,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp
index cf2812960..5b860fcbf 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h
index 980eb28bc..965af8361 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/WaveShapeSmps.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp
index 6148d68de..d10967af4 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.cpp
@@ -8,8 +8,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h
index d046888b0..6f120feb4 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Misc/XMLwrapper.h
@@ -8,8 +8,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp
index 434e2fbd3..8c343149a 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.cpp
@@ -7,7 +7,7 @@
     This file is part of ZynAddSubFX, which is free software: you can
     redistribute it and/or modify it under the terms of the GNU General
     Public License as published by the Free Software Foundation, either
-    version 3 of the License, or (at your option) any later version.
+    version 2 of the License, or (at your option) any later version.
 
     ZynAddSubFX is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h
index 0b9cc3c15..3414f45ed 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AlsaEngine.h
@@ -7,7 +7,7 @@
     This file is part of ZynAddSubFX, which is free software: you can
     redistribute it and/or modify it under the terms of the GNU General
     Public License as published by the Free Software Foundation, either
-    version 3 of the License, or (at your option) any later version.
+    version 2 of the License, or (at your option) any later version.
 
     ZynAddSubFX is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp
index 8c4f2d449..9588ac834 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.cpp
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h
index f8e1a97ed..7bf2f413c 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/AudioOut.h
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp
index 5e846b708..3e026a52a 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.cpp
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h
index 9de4422c7..9be04be4a 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/Engine.h
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp
index 1201024dd..c3ce0a63b 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.cpp
@@ -6,7 +6,7 @@
     This file is part of yoshimi, which is free software: you can
     redistribute it and/or modify it under the terms of the GNU General
     Public License as published by the Free Software Foundation, either
-    version 3 of the License, or (at your option) any later version.
+    version 2 of the License, or (at your option) any later version.
 
     yoshimi is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h
index 705ff3ecf..29f6de0a3 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/JackEngine.h
@@ -6,7 +6,7 @@
     This file is part of yoshimi, which is free software: you can
     redistribute it and/or modify it under the terms of the GNU General
     Public License as published by the Free Software Foundation, either
-    version 3 of the License, or (at your option) any later version.
+    version 2 of the License, or (at your option) any later version.
 
     yoshimi is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp
index 3635bde2e..5b9779034 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h
index 780a67ff5..6dafc9df8 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/MidiIn.h
@@ -8,8 +8,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp
index 633e2ae24..63d9c90c1 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h
index 18341809e..afc4859c6 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/NulEngine.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp
index 1c6cdf11c..245bdf756 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h
index cdccc8120..11fdd27d2 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/OssEngine.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp
index d41543b04..c27467a7c 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h
index 12fd766a8..f9c5fc33b 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/PaEngine.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp
index 1c3d66ec8..78e5ac450 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.cpp
@@ -3,8 +3,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h
index 73f553c96..06dfe7264 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Nio/WavEngine.h
@@ -7,8 +7,9 @@
           Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp
index b343a486c..669121e79 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h b/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h
index f7eaaf359..acc0fd21d 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Output/DSSIaudiooutput.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp
index 02564dbbf..e4c9dcd00 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h
index a95e1d1bd..eb35109a1 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/ADnoteParameters.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp
index 5d1265450..777852462 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h
index 22483eaaa..2e61571a1 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Controller.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp
index a06704d63..57d244dfc 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h
index 0b3e99c96..64a064871 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/EnvelopeParams.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp
index 81309d6c7..1b82d9bc0 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h
index 22a1a94f8..92cde419a 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/FilterParams.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp
index 72f2269da..5d57bb00b 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h
index 6ca307193..41572d9b4 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/LFOParams.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
index 027289b61..d0572cac3 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h
index b3283216a..d710d8613 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp
index d96fc536e..5fff68cf0 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h
index a64d25e74..f500099e7 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/Presets.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp
index 3dcf12637..d10176e15 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h
index 724dc0b58..00b812390 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsArray.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp
index 7a6366a08..db055501f 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h
index a2f48fd21..6753236c2 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/PresetsStore.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp
index 7e303742b..125a49b6a 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h b/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h
index adbfca3ec..dea2a39f5 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Params/SUBnoteParameters.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp
index c43f1fa3f..c3d7e86ce 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h
index 53420ee0e..76abd2790 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/ADnote.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp
index 41bb80473..6fd086ff9 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h
index 8c6b082a7..af4a4a7b1 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Envelope.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp
index af9d10d77..02bc35d53 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h
index 2b933a34d..a4c7e1fa2 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/LFO.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp
index d51957eaa..6cd89dcc6 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h
index 483a3859a..25c78b06b 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/OscilGen.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp
index 1778b3388..46d741c79 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h
index f40199672..41d1a6cdb 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/PADnote.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp
index 4eb4e0197..b358498e6 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h
index 777857110..30ec4b6c6 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/Resonance.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp
index 6c6144718..7aebb5f3c 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.cpp
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h
index 87e1e93a2..dfffcccc0 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SUBnote.h
@@ -6,8 +6,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h
index 3058e5d3f..1101e9ff1 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Synth/SynthNote.h
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h
index bd66704e0..30cab9975 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/AdNoteTest.h
@@ -7,8 +7,9 @@
   Authors: Mark McCurry, Harald Hvaal
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h
index f9b97046b..8f760dcdc 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/ControllerTest.h
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h
index c0a295ed6..3ea0086f4 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/EchoTest.h
@@ -7,8 +7,9 @@
   Authors: Mark McCurry, Harald Hvaal
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h
index 6ce1ca524..3d8db36a4 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/MicrotonalTest.h
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h
index b0e13b254..894af2487 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/OscilGenTest.h
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h
index 086efcdf0..edea6f65b 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PadNoteTest.h
@@ -6,8 +6,9 @@
   Author: zco
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h
index b88e9ba40..71b5ed401 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/PluginTest.h
@@ -6,8 +6,9 @@
   Authors: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h
index 2a51e952c..a9925ad5f 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/RandTest.h
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h
index e5cefd860..518ea8611 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/SubNoteTest.h
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h
index 86635004c..08a55e1c9 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/UnisonTest.h
@@ -7,8 +7,9 @@
   Authors: Mark McCurry, Harald Hvaal
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h
index bf31ae085..0d375b3ac 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/Tests/XMLwrapperTest.h
@@ -6,8 +6,9 @@
   Author: Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/globals.h b/plugins/zynaddsubfx/zynaddsubfx/src/globals.h
index d98e8babd..09ce60b15 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/globals.h
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/globals.h
@@ -7,8 +7,9 @@
   Author: Nasca Octavian Paul
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp b/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp
index 555b1b429..750e9a2f2 100644
--- a/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp
+++ b/plugins/zynaddsubfx/zynaddsubfx/src/main.cpp
@@ -6,8 +6,9 @@
   Copyright (C) 2012-2014 Mark McCurry
 
   This program is free software; you can redistribute it and/or modify
-  it under the terms of version 2 of the GNU General Public License
-  as published by the Free Software Foundation.
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of