diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e5636d6..d92e69d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## v1.6.0
+
+This update contains API breaking changes to the SCPI server. This was necessary because the previous implementation did not follow the standard completely. If you were talking to the SCPI server directly yourself, you will need to make the required changes. If you are using the provided libreVNA.py class, you just need to update that file.
+
+- New featues:
+  - New SCPI command: read/write preferences
+  - New API: option to stream live trace data
+
+- Bugfixes and improvements:
+  - Keep de-embedding active when changing settings
+  - Improvements to trace averaging
+  - adjust SCPI API to conform better with the standard:
+    - new required commands RST, CLS, ESE, ESR, OPC and WAI
+    - no responses to commands, errors are reported through status registers instead
+  - TDR updates happen during a sweep not just afterwards (with configurable update rate)
+  - Additional sanity checks when loading calibration files
+
 ## v1.5.1
 
 Mostly bugfixes with only minor new features
diff --git a/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro b/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
index 138e61e0..678616cf 100644
--- a/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
+++ b/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
@@ -397,5 +397,5 @@ QMAKE_CXXFLAGS += -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-c
 CONFIG += c++17
 REVISION = $$system(git rev-parse HEAD)
 DEFINES += GITHASH=\\"\"$$REVISION\\"\"
-DEFINES += FW_MAJOR=1 FW_MINOR=5 FW_PATCH=1 FW_SUFFIX=""
+DEFINES += FW_MAJOR=1 FW_MINOR=6 FW_PATCH=0 FW_SUFFIX=""
 DEFINES -= _UNICODE UNICODE
diff --git a/Software/VNA_embedded/.cproject b/Software/VNA_embedded/.cproject
index b457c0df..9ccfb3bc 100644
--- a/Software/VNA_embedded/.cproject
+++ b/Software/VNA_embedded/.cproject
@@ -43,8 +43,8 @@
 									<listOptionValue builtIn="false" value="_RTOS"/>
 									<listOptionValue builtIn="false" value="_SNK"/>
 									<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
-									<listOptionValue builtIn="false" value="FW_MINOR=5"/>
-									<listOptionValue builtIn="false" value="FW_PATCH=1"/>
+									<listOptionValue builtIn="false" value="FW_MINOR=6"/>
+									<listOptionValue builtIn="false" value="FW_PATCH=0"/>
 									<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
 									<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
@@ -90,8 +90,8 @@
 								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols.536220696" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
 									<listOptionValue builtIn="false" value="DEBUG"/>
 									<listOptionValue builtIn="false" value="FW_MAJOR=1"/>
-									<listOptionValue builtIn="false" value="FW_MINOR=5"/>
-									<listOptionValue builtIn="false" value="FW_PATCH=1"/>
+									<listOptionValue builtIn="false" value="FW_MINOR=6"/>
+									<listOptionValue builtIn="false" value="FW_PATCH=0"/>
 									<listOptionValue builtIn="false" value="HW_REVISION='B'"/>
 									<listOptionValue builtIn="false" value="USE_FULL_LL_DRIVER"/>
 									<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
diff --git a/Software/VNA_embedded/Makefile b/Software/VNA_embedded/Makefile
index 98d717e2..d701b3eb 100644
--- a/Software/VNA_embedded/Makefile
+++ b/Software/VNA_embedded/Makefile
@@ -100,8 +100,8 @@ MCU = $(CPU) -mthumb $(FLOAT-ABI) $(FPU)
 # C defines
 C_DEFS =  \
 -DFW_MAJOR=1 \
--DFW_MINOR=5 \
--DFW_PATCH=1 \
+-DFW_MINOR=6 \
+-DFW_PATCH=0 \
 -DDEBUG \
 -DUSE_FULL_LL_DRIVER \
 -DHW_REVISION="'B'" \