diff --git a/.gitmodules b/.gitmodules
index f8ebf7732..6cf8b510b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,61 +3,61 @@
 	url = git://git.linphone.org/linphone
 [submodule "submodules/externals/gsm"]
 	path = submodules/externals/gsm
-	url = git://git.linphone.org/gsm.git
+	url = git://git.linphone.org/gsm
 [submodule "submodules/externals/speex"]
 	path = submodules/externals/speex
-	url = git://git.linphone.org/speex.git
+	url = git://git.linphone.org/speex
 [submodule "submodules/msilbc"]
 	path = submodules/msilbc
-	url = git://git.linphone.org/msilbc.git
+	url = git://git.linphone.org/msilbc
 [submodule "submodules/libilbc-rfc3951"]
 	path = submodules/libilbc-rfc3951
-	url = git://git.linphone.org/libilbc-rfc3951.git
+	url = git://git.linphone.org/libilbc-rfc3951
 [submodule "submodules/externals/opencore-amr"]
 	path = submodules/externals/opencore-amr
 	url = git://git.linphone.org/opencore-amr
 	ignore = dirty
 [submodule "submodules/msamr"]
 	path = submodules/msamr
-	url = git://git.linphone.org/msamr.git
+	url = git://git.linphone.org/msamr
 [submodule "submodules/externals/ffmpeg"]
 	path = submodules/externals/ffmpeg
-	url = git://git.linphone.org/ffmpeg.git
+	url = git://git.linphone.org/ffmpeg
 [submodule "submodules/externals/x264"]
 	path = submodules/externals/x264
-	url = git://git.linphone.org/x264.git
+	url = git://git.linphone.org/x264
 	ignore = dirty
 [submodule "submodules/msx264"]
 	path = submodules/msx264
-	url = git://git.linphone.org/msx264.git
+	url = git://git.linphone.org/msx264
 [submodule "submodules/externals/libvpx"]
 	path = submodules/externals/libvpx
 	url = https://github.com/webmproject/libvpx
 	ignore = dirty
 [submodule "submodules/bzrtp"]
 	path = submodules/bzrtp
-	url = git://git.linphone.org/bzrtp.git
+	url = git://git.linphone.org/bzrtp
 [submodule "submodules/mssilk"]
 	path = submodules/mssilk
-	url = git://git.linphone.org/mssilk.git
+	url = git://git.linphone.org/mssilk
 [submodule "submodules/externals/srtp"]
 	path = submodules/externals/srtp
-	url = git://git.linphone.org/srtp.git
+	url = git://git.linphone.org/srtp
 [submodule "submodules/bcg729"]
 	path = submodules/bcg729
-	url = git://git.linphone.org/bcg729.git
+	url = git://git.linphone.org/bcg729
 [submodule "submodules/belle-sip"]
 	path = submodules/belle-sip
 	url = git://git.linphone.org/belle-sip
 [submodule "submodules/externals/antlr3"]
 	path = submodules/externals/antlr3
-	url = git://git.linphone.org/antlr3.git
+	url = git://git.linphone.org/antlr3
 [submodule "submodules/externals/polarssl"]
 	path = submodules/externals/polarssl
-	url = git://git.linphone.org/polarssl.git
+	url = git://git.linphone.org/polarssl
 [submodule "submodules/externals/opus"]
 	path = submodules/externals/opus
-	url = git://git.opus-codec.org/opus.git
+	url = git://git.linphone.org/opus
 	ignore = dirty
 [submodule "submodules/externals/libxml2"]
 	path = submodules/externals/libxml2
@@ -65,7 +65,7 @@
 	ignore = dirty
 [submodule "submodules/cunit"]
 	path = submodules/cunit
-	url = git://git.linphone.org/cunit.git
+	url = git://git.linphone.org/cunit
 	ignore = dirty
 [submodule "submodules/externals/openh264"]
 	path = submodules/externals/openh264
@@ -73,17 +73,17 @@
 	ignore = dirty
 [submodule "submodules/msopenh264"]
 	path = submodules/msopenh264
-	url = git://git.linphone.org/msopenh264.git
+	url = git://git.linphone.org/msopenh264
 [submodule "submodules/mswebrtc"]
 	path = submodules/mswebrtc
-	url = git://git.linphone.org/mswebrtc.git
+	url = git://git.linphone.org/mswebrtc
 [submodule "Classes/KIF"]
 	path = Classes/KIF
-	url = https://github.com/kif-framework/KIF.git
+	url = https://github.com/kif-framework/KIF
 	ignore = dirty
 [submodule "submodules/cmake-builder"]
 	path = submodules/cmake-builder
-	url = git://git.linphone.org/linphone-cmake-builder.git
+	url = git://git.linphone.org/linphone-cmake-builder
 [submodule "submodules/externals/vo-amrwbenc"]
 	path = submodules/externals/vo-amrwbenc
 	url = git://git.linphone.org/vo-amrwbenc