diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8c2d7493..0a779fd05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,15 @@ Group changes to describe their impact on the project, as follows:
     Fixed for any bug fixes.
     Security to invite users to upgrade in case of vulnerabilities.
 
+## [4.0] - 2018-06-11
+
+### Added
+- Supports of group chat
+- New address search algorithm
+
+### Fixed
+- Minor bugs fixes
+
 ## [3.16.5] - 2017-11-28
 
 ### Added
diff --git a/Resources/zh_TW.lproj/Localizable.strings b/Resources/zh_TW.lproj/Localizable.strings
deleted file mode 100644
index ffee87dc1..000000000
Binary files a/Resources/zh_TW.lproj/Localizable.strings and /dev/null differ
diff --git a/linphone-Info.plist b/linphone-Info.plist
index 932793049..202f19195 100644
--- a/linphone-Info.plist
+++ b/linphone-Info.plist
@@ -24,7 +24,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.99.12</string>
+	<string>4.0</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index bf61ce87c..f9f384e3f 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -1586,7 +1586,6 @@
 		63AADBE41B6A0FF200AA16FD /* assistant_linphone_create.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = assistant_linphone_create.rc; sourceTree = "<group>"; };
 		63AADBE51B6A0FF200AA16FD /* assistant_linphone_existing.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = assistant_linphone_existing.rc; sourceTree = "<group>"; };
 		63AADBE61B6A0FF200AA16FD /* assistant_remote.rc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = assistant_remote.rc; sourceTree = "<group>"; };
-		63AADBE71B6A0FF200AA16FD /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/Localizable.strings; sourceTree = "<group>"; };
 		63B21A791C623DA80074DFF8 /* test_failed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = test_failed.png; sourceTree = "<group>"; };
 		63B21A7A1C623DA80074DFF8 /* test_inprogress.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = test_inprogress.png; sourceTree = "<group>"; };
 		63B21A7B1C623DA80074DFF8 /* test_passed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = test_passed.png; sourceTree = "<group>"; };
@@ -4468,7 +4467,6 @@
 				63AADBCB1B6A0FF200AA16FD /* ja */,
 				63AADBDD1B6A0FF200AA16FD /* nl */,
 				63AADBE11B6A0FF200AA16FD /* ru */,
-				63AADBE71B6A0FF200AA16FD /* zh_TW */,
 				8C435FC320BD41C6004CCA25 /* fr */,
 			);
 			name = Localizable.strings;