diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index bef0613b5..91fc9bd22 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -1,6 +1,6 @@
 GITVERSION_FILE=liblinphone_gitversion.h
 GITVERSION_FILE_TMP=liblinphone_gitversion.h.tmp
-GITDESCRIBE=`git describe`
+GITDESCRIBE=`git describe --always`
 GITREVISION=`git rev-parse HEAD`
 
 ECHO=/bin/echo
diff --git a/mediastreamer2 b/mediastreamer2
index 5a7ae95e0..8596ed901 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 5a7ae95e0dbe5f485086d4635a655c893c9c44b1
+Subproject commit 8596ed9017c0d9b9c63c758d7628bac1fc07efd7