diff --git a/.gitmodules b/.gitmodules
index 48a6bfc5b..cdfee6b31 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -117,3 +117,6 @@
 [submodule "submodules/externals/soci"]
 	path = submodules/externals/soci
 	url = git://git.linphone.org/soci
+[submodule "submodules/externals/zxing-cpp"]
+	path = submodules/externals/zxing-cpp
+	url = git://git.linphone.org/zxing-cpp.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26e8b01c2..b6801e467 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,13 +5,27 @@ Group changes to describe their impact on the project, as follows:
 
     Added for new features.
     Changed for changes in existing functionality.
-    Deprecated for once-stable features removed in upcoming releases.é
+    Deprecated for once-stable features removed in upcoming releases.
     Removed for deprecated features removed in this release.
     Fixed for any bug fixes.
     Security to invite users to upgrade in case of vulnerabilities.
 
 ## [Incomming]
 
+## [4.0.0] - 2018-06-15
+
+### Added
+- Group chat between linphone.org SIP accounts.
+- new JAVA/JNI wrapper. This new wrapper is automatically generated from liblinphone C API. It breaks compatibility with previous, hand-made wrapper.
+  (more information about new wrapper [here.](https://wiki.linphone.org/xwiki/wiki/public/view/Lib/Linphone%20%28Android%29%20Java%20wrapper/) )
+
+### Deprecated
+- hand-made java API in submodules/linphone/java is deprecated. However it is still possible to use it by checking out the 3.4.x branch of linphone-android.
+
+### Fixed
+- issue with changing push notification token not passed to library, possibly resulting in a loss of incoming calls.
+
+
 ## [3.3.0] - 2017-10-18
 
 ### Added
diff --git a/liblinphone-sdk/build.gradle b/liblinphone-sdk/build.gradle
index 78c6d83fe..d8fa83f78 100644
--- a/liblinphone-sdk/build.gradle
+++ b/liblinphone-sdk/build.gradle
@@ -54,7 +54,7 @@ else {
 }
 
 srcDir += [rootSdk+'/share/linphonej/java/org/linphone/core/']
-
+srcDir += ['../submodules/linphone/wrappers/java/classes/']
 
 def excludePackage = []
 
diff --git a/prepare.py b/prepare.py
index 4ad88b5e0..a16d7c6b9 100755
--- a/prepare.py
+++ b/prepare.py
@@ -371,7 +371,7 @@ generate-javadoc:
 debug-sdk: java-clean build copy-libs generate-javadoc generate-apk
 \t./gradlew -q sdkZip
 
-release-sdk: java-clean build copy-libs generate-javadoc release
+liblinphone-android-sdk: java-clean build copy-libs generate-javadoc release
 \t./gradlew -q sdkZip
 
 linphone-android-sdk: java-clean build copy-libs 
diff --git a/src/android/org/linphone/LinphoneManager.java b/src/android/org/linphone/LinphoneManager.java
index f57c11ef7..43b5b11f5 100644
--- a/src/android/org/linphone/LinphoneManager.java
+++ b/src/android/org/linphone/LinphoneManager.java
@@ -1774,4 +1774,7 @@ public class LinphoneManager implements CoreListener, SensorEventListener, Accou
 			mUnreadChatsPerRoom.put(key, 1);
 		}
 	}
+
+	public void onQrcodeFound(Core lc, String something){
+	}
 }
diff --git a/src/android/org/linphone/LinphoneUtils.java b/src/android/org/linphone/LinphoneUtils.java
index 49860166d..05bd4f9c4 100644
--- a/src/android/org/linphone/LinphoneUtils.java
+++ b/src/android/org/linphone/LinphoneUtils.java
@@ -416,7 +416,7 @@ public final class LinphoneUtils {
 		String extension = LinphoneUtils.getExtensionFromFileName(path);
 		if(extension != null)
 			extension = extension.toLowerCase();
-		return (extension != null && extension.matches(".*(png|jpg|jpeg|bmp|gif).*"));
+		return (extension != null && extension.matches("(png|jpg|jpeg|bmp|gif)"));
 	}
 
 	public static void recursiveFileRemoval(File root) {
diff --git a/submodules/externals/zxing-cpp b/submodules/externals/zxing-cpp
new file mode 160000
index 000000000..0f267e5fb
--- /dev/null
+++ b/submodules/externals/zxing-cpp
@@ -0,0 +1 @@
+Subproject commit 0f267e5fb66d45b32fba302bef0028dcf0dda84f