diff --git a/CHANGELOG b/CHANGELOG
index 13c7c9490..eba4a430c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+sdrangel (6.18.0-1) unstable; urgency=medium
+
+  * New Jogdial Control feature. Implements #1088
+  * RollupWidget: make rollup state a Serializable object. Prerequisite to #1050
+
+  -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sun, 09 Jan 2022 09:42:30 +0100
+
 sdrangel (6.17.7-1) unstable; urgency=medium
 
   * Simple PTT feature: added vox control. Implements #1002
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa96a03a3..8ab0b9973 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,8 +15,8 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
 # configure version
 set(sdrangel_VERSION_MAJOR "6")
-set(sdrangel_VERSION_MINOR "17")
-set(sdrangel_VERSION_PATCH "7")
+set(sdrangel_VERSION_MINOR "18")
+set(sdrangel_VERSION_PATCH "0")
 set(sdrangel_VERSION_SUFFIX "")
 
 # SDRAngel cmake options
diff --git a/debian/changelog b/debian/changelog
index 6922750a5..69636dbf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sdrangel (6.18.0-1) unstable; urgency=medium
+
+  * New Jogdial Control feature. Implements #1088
+  * RollupWidget: make rollup state a Serializable object. Prerequisite to #1050
+
+  -- Edouard Griffiths, F4EXB <f4exb06@gmail.com>  Sun, 09 Jan 2022 09:42:30 +0100
+
 sdrangel (6.17.7-1) unstable; urgency=medium
 
   * Simple PTT feature: added vox control. Implements #1002
diff --git a/plugins/channelrx/radioclock/radioclocksettings.cpp b/plugins/channelrx/radioclock/radioclocksettings.cpp
index 14cb04116..1cca135e8 100644
--- a/plugins/channelrx/radioclock/radioclocksettings.cpp
+++ b/plugins/channelrx/radioclock/radioclocksettings.cpp
@@ -25,8 +25,8 @@
 
 RadioClockSettings::RadioClockSettings() :
     m_channelMarker(nullptr),
-    m_rollupState(nullptr),
-    m_scopeGUI(nullptr)
+    m_scopeGUI(nullptr),
+    m_rollupState(nullptr)
 {
     resetToDefaults();
 }