diff --git a/.appveyor.yml b/.appveyor.yml
index a0b8b9365..df725e11b 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -17,7 +17,7 @@ environment:
       # RelWithDebInfo
       configuration: Release
       # CMAKE_CUSTOM_OPTIONS: "-DENABLE_EXTERNAL_LIBRARIES=OFF"
-      CMAKE_CUSTOM_OPTIONS: "-DFORCE_SSE41=ON -DQT_MISSING=OFF -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DENABLE_SERVER=OFF"
+      CMAKE_CUSTOM_OPTIONS: "-DFORCE_SSE41=ON -DQT_MISSING=OFF -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF"
       CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
     - TARGET: ubuntu2004prod
       APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2004
diff --git a/CHANGELOG b/CHANGELOG
index 05db5fd82..4b35e601b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+sdrangel (4.18.0-1) unstable; urgency=medium
+
+   * New feature plugins framework. Implements #632
+   * Simple PTT feature plugin. Implements #635
+   * Migration of RigCtl plugin to feature plugins. Implements #636
+   * Faster SR for test source and file output. PR #647
+
+  -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Tue, 29 Sep 2020 06:40:35 +0200
+
 sdrangel (4.17.0-1) unstable; urgency=medium
 
    * Packet modulator: new channel Tx plugin
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f5bd7197..d37bbddc9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -17,7 +17,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 
 # configure version
 set(sdrangel_VERSION_MAJOR "4")
-set(sdrangel_VERSION_MINOR "17")
+set(sdrangel_VERSION_MINOR "18")
 set(sdrangel_VERSION_PATCH "0")
 set(sdrangel_VERSION_SUFFIX "")
 
diff --git a/debian/changelog b/debian/changelog
index f889ed358..b66786735 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sdrangel (4.18.0-1) unstable; urgency=medium
+
+   * New feature plugins framework. Implements #632
+   * Simple PTT feature plugin. Implements #635
+   * Migration of RigCtl plugin to feature plugins. Implements #636
+   * Faster SR for test source and file output. PR #647
+
+  -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Tue, 29 Sep 2020 06:40:35 +0200
+
 sdrangel (4.17.0-1) unstable; urgency=medium
 
    * Packet modulator: new channel Tx plugin
diff --git a/plugins/feature/rigctlserver/rigctlserverplugin.cpp b/plugins/feature/rigctlserver/rigctlserverplugin.cpp
index 4f30ec491..339d82f12 100644
--- a/plugins/feature/rigctlserver/rigctlserverplugin.cpp
+++ b/plugins/feature/rigctlserver/rigctlserverplugin.cpp
@@ -30,8 +30,8 @@
 const PluginDescriptor RigCtlServerPlugin::m_pluginDescriptor = {
     RigCtlServer::m_featureId,
 	QString("RigCtl Server"),
-	QString("5.12.0"),
-	QString("(c) Edouard Griffiths, F4EXB"),
+	QString("4.18.0"),
+	QString("(c) Jon Beniston, M7RCE and Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,
 	QString("https://github.com/f4exb/sdrangel")
diff --git a/plugins/feature/simpleptt/simplepttplugin.cpp b/plugins/feature/simpleptt/simplepttplugin.cpp
index c9d8d8eff..454d3f328 100644
--- a/plugins/feature/simpleptt/simplepttplugin.cpp
+++ b/plugins/feature/simpleptt/simplepttplugin.cpp
@@ -29,7 +29,7 @@
 const PluginDescriptor SimplePTTPlugin::m_pluginDescriptor = {
     SimplePTT::m_featureId,
 	QString("Simple PTT"),
-	QString("5.12.0"),
+	QString("4.18.0"),
 	QString("(c) Edouard Griffiths, F4EXB"),
 	QString("https://github.com/f4exb/sdrangel"),
 	true,