diff --git a/Makefile.am b/Makefile.am
index 55fc17617..7960711f0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -161,7 +161,7 @@ zip:
 	make gtk-cherrypick
 	make other-cherrypick
 	cp -f $(top_srcdir)/gtk/gtkrc $(INSTALLDIR_WITH_PREFIX)/.
-	cp -f $(top_srcdir)/README.md $(INSTALLDIR_WITH_PREFIX)/.
+	cp -f $(top_srcdir)/README $(INSTALLDIR_WITH_PREFIX)/.
 	cp -f $(top_srcdir)/COPYING $(INSTALLDIR_WITH_PREFIX)/.
 	cd $(INSTALLDIR_WITH_PREFIX) && zip -r $(ZIPFILE) *
 
@@ -173,7 +173,7 @@ sdk:
 # remove unwanted stuff (gtk interface)
 	cd $(INSTALLDIR_WITH_PREFIX) && rm -rf $(SDK_EXCLUDED)
 	make other-cherrypick
-	cp -f $(top_srcdir)/README.md $(INSTALLDIR_WITH_PREFIX)/.
+	cp -f $(top_srcdir)/README $(INSTALLDIR_WITH_PREFIX)/.
 	cp -f $(top_srcdir)/COPYING $(INSTALLDIR_WITH_PREFIX)/.
 	cd $(INSTALLDIR_WITH_PREFIX) && zip -r $(SDK_ZIPFILE) *
 
diff --git a/README.md b/README
similarity index 100%
rename from README.md
rename to README
diff --git a/linphone.iss.in b/linphone.iss.in
index c065c2b52..aa700200c 100644
--- a/linphone.iss.in
+++ b/linphone.iss.in
@@ -8,7 +8,7 @@ AppUpdatesURL=http://www.linphone.org
 DefaultDirName={pf}\Linphone
 DefaultGroupName=Linphone
 LicenseFile=COPYING
-;InfoBeforeFile=README.md
+;InfoBeforeFile=README
 OutputBaseFilename=setup
 Compression=lzma
 SolidCompression=yes
diff --git a/linphone.spec.in b/linphone.spec.in
index f18bf0cbe..ca4d43a62 100644
--- a/linphone.spec.in
+++ b/linphone.spec.in
@@ -23,15 +23,15 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	i686
 %endif
 
-BuildRequires: gtk2-devel
-BuildRequires: belle-sip-devel speex-devel gettext
-BuildRequires: intltool gettext-devel
+BuildRequires: gtk2-devel 
+BuildRequires: belle-sip-devel speex-devel gettext 
+BuildRequires: intltool gettext-devel 
 %if %{video}
 BuildRequires: ffmpeg-devel SDL-devel
 %endif
 
 %description
-Linphone is a SIP compliant audio & video phone. It can be used to run calls
+Linphone is a SIP compliant audio & video phone. It can be used to run calls 
 over the internet. It has a gtk+ and console interface.
 
 %package devel
@@ -79,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README.md TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/linphone
 %{_bindir}/linphonec
 %{_bindir}/linphonecsh
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index 447383b10..08d8950e8 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -70,12 +70,15 @@ set(CERTIFICATE_FILES ${CERTIFICATE_ALT_FILES} ${CERTIFICATE_CN_FILES})
 
 set(RC_FILES
 	rcfiles/carddav_rc
+	rcfiles/conference_focus_rc
 	rcfiles/empty_rc
 	rcfiles/friends_rc
 	rcfiles/laure_call_logs_rc
 	rcfiles/laure_rc_udp
+	rcfiles/laure_tcp_rc
 	rcfiles/marie_early_rc
 	rcfiles/marie_h264_rc
+	rcfiles/marie_nat64_rc
 	rcfiles/marie_quality_reporting_rc
 	rcfiles/marie_rc
 	rcfiles/marie_rc_rtcp_xr
@@ -91,17 +94,22 @@ set(RC_FILES
 	rcfiles/marie_remote_rc
 	rcfiles/marie_sips_rc
 	rcfiles/marie_transient_remote_rc
+	rcfiles/marie_v4proxy_rc
 	rcfiles/marie_zrtp_aes256_rc
 	rcfiles/marie_zrtp_b256_rc
 	rcfiles/marie_zrtp_srtpsuite_aes256_rc
 	rcfiles/michelle_rc_udp
 	rcfiles/multi_account_rc
 	rcfiles/pauline_alt_rc
+	rcfiles/pauline_as_friend_rc
 	rcfiles/pauline_h264_rc
+	rcfiles/pauline_nat64_rc
 	rcfiles/pauline_rc
 	rcfiles/pauline_rc_rtcp_xr
 	rcfiles/pauline_sips_rc
 	rcfiles/pauline_tcp_rc
+	rcfiles/pauline_tunnel_verify_server_certificate_rc
+	rcfiles/pauline_v4proxy_rc
 	rcfiles/pauline_wild_rc
 	rcfiles/pauline_zrtp_aes256_rc
 	rcfiles/pauline_zrtp_b256_rc
@@ -246,7 +254,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 	endif()
 endif()
 
-# on iOS though, we also build the executable so that one can compile it from Xcode and run it directly
+# on iOS though, we also build the exectuable so that one can compile it from Xcode and run it directly
 if (NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
 	if(IOS)
 		set_source_files_properties(${IOS_RESOURCES_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)