diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22b73043..b53745b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,8 +27,8 @@ SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
 
 ## build settings
 SET(PAHO_VERSION_MAJOR 1)
-SET(PAHO_VERSION_MINOR 2)
-SET(PAHO_VERSION_PATCH 1)
+SET(PAHO_VERSION_MINOR 3)
+SET(PAHO_VERSION_PATCH 0)
 SET(CLIENT_VERSION ${PAHO_VERSION_MAJOR}.${PAHO_VERSION_MINOR}.${PAHO_VERSION_PATCH})
 
 INCLUDE(GNUInstallDirs)
diff --git a/Makefile b/Makefile
index 064543ec..639bf404 100755
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@ SHELL = /bin/sh
 .PHONY: clean, mkdir, install, uninstall, html
 
 ifndef release.version
-  release.version = 1.2.1
+  release.version = 1.3.0
 endif
 
 # determine current platform
diff --git a/appveyor.yml b/appveyor.yml
index d7d82320..7cf1a9e0 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 1.2.{build}
+version: 1.3.{build}
  
 environment:
   matrix:
diff --git a/build.xml b/build.xml
index da00fe1a..0df93c9c 100644
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,7 @@
   </taskdef>
 
   <property name="output.folder" value="build/output" />
-  <property name="release.version" value="1.2.1" />
+  <property name="release.version" value="1.3.0" />
 
   <property name="libname" value="mqttv3c" />
   <property name="libname.ssl" value="mqttv3cs" />
diff --git a/cmake/modules/CMakeDebHelperInstall.cmake b/cmake/modules/CMakeDebHelperInstall.cmake
index 7e61b325..f01072e5 100644
--- a/cmake/modules/CMakeDebHelperInstall.cmake
+++ b/cmake/modules/CMakeDebHelperInstall.cmake
@@ -1,17 +1,3 @@
-# This script is used internally by CMakeDebHelper.
-# It is run at CPack-Time and copies the files generated by the debhelpers to the right place.
-
-if( NOT CPACK_DEBIAN_PACKAGE_NAME )
-    string( TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_DEBIAN_PACKAGE_NAME )
-endif()
-
-# Copy all generated files where the packing will happen,
-# exclude the DEBIAN-directory.
-
-MESSAGE(STATUS "CPACK_OUTPUT_FILE_PREFIX: " "${CPACK_OUTPUT_FILE_PREFIX}/debian/${CPACK_DEBIAN_PACKAGE_NAME}/")
-
-file( COPY
-    "${CPACK_OUTPUT_FILE_PREFIX}/debian/${CPACK_DEBIAN_PACKAGE_NAME}/"
-    DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" 
-    PATTERN DEBIAN EXCLUDE
-)
+#=============================================================================
+# Removed content due to licensing/copyright issues
+#=============================================================================
diff --git a/conanfile.py b/conanfile.py
index 252c063b..26a8a032 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -3,7 +3,7 @@ from conans import ConanFile, CMake, tools
 
 class PahocConan(ConanFile):
     name = "paho.mqtt.c"
-    version = "1.2.0"
+    version = "1.3.0"
     license = "Eclipse Public License - v 1.0"
     url = "https://github.com/eclipse/paho.mqtt.c"
     description = """The Eclipse Paho project provides open-source client implementations of MQTT
diff --git a/dist/Makefile b/dist/Makefile
index 4af72457..8c421eda 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.2.1
+VERSION=1.3.0
 
 check:
 	rpmlint -i dist/paho-c.spec
diff --git a/dist/paho-c.spec b/dist/paho-c.spec
index fd132c9e..b1d7141f 100644
--- a/dist/paho-c.spec
+++ b/dist/paho-c.spec
@@ -1,6 +1,6 @@
 Summary:            MQTT C Client
 Name:               paho-c
-Version:            1.2.1
+Version:            1.3.0
 Release:            3%{?dist}
 License:            Eclipse Distribution License 1.0 and Eclipse Public License 1.0
 Group:              Development/Tools
diff --git a/src/MQTTAsync.h b/src/MQTTAsync.h
index 0e658e42..1b3593d2 100644
--- a/src/MQTTAsync.h
+++ b/src/MQTTAsync.h
@@ -828,7 +828,11 @@ typedef struct
 	int sendWhileDisconnected;
 	/** the maximum number of messages allowed to be buffered while not connected. */
 	int maxBufferedMessages;
-	/** Whether the MQTT version is 3 and 4, or 5.  To use 5, this must be set. */
+	/** Whether the MQTT version is 3.1, 3.1.1, or 5.  To use V5, this must be set.
+	 *  MQTT V5 has to be chosen here, because during the create call the message persistence
+	 *  is initialized, and we want to know whether the format of any persisted messages
+	 *  is appropriate for the MQTT version we are going to connect with.  Selecting 3.1 or
+	 *  3.1.1 and attempting to read 5.0 persisted messages will result in an error on create.  */
 	int MQTTVersion;
 } MQTTAsync_createOptions;
 
diff --git a/src/MQTTClient.h b/src/MQTTClient.h
index 077503ce..b3fadbe7 100644
--- a/src/MQTTClient.h
+++ b/src/MQTTClient.h
@@ -530,7 +530,11 @@ typedef struct
 	char struct_id[4];
 	/** The version number of this structure.  Must be 0 */
 	int struct_version;
-	/** Whether the MQTT version is 3 and 4, or 5.  To use 5, this must be set. */
+	/** Whether the MQTT version is 3.1, 3.1.1, or 5.  To use V5, this must be set.
+	 *  MQTT V5 has to be chosen here, because during the create call the message persistence
+	 *  is initialized, and we want to know whether the format of any persisted messages
+	 *  is appropriate for the MQTT version we are going to connect with.  Selecting 3.1 or
+	 *  3.1.1 and attempting to read 5.0 persisted messages will result in an error on create.  */
 	int MQTTVersion;
 } MQTTClient_createOptions;