diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 8a3b62daf..547623652 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -170,12 +170,14 @@ make_gitversion_h:
 			$(ECHO) -n "#define LIBLINPHONE_GIT_VERSION \"$(GITDESCRIBE)\"" > $(GITVERSION_FILE_TMP) ; \
 		elif test "$(GITREVISION)" != "" ; then \
 			$(ECHO) -n "#define LIBLINPHONE_GIT_VERSION \"$(LINPHONE_VERSION)_$(GITREVISION)\"" > $(GITVERSION_FILE_TMP) ; \
+		else \
+			$(ECHO) -n "" > $(GITVERSION_FILE_TMP) ; \
 		fi ; \
 	else \
 		$(ECHO) -n "" > $(GITVERSION_FILE_TMP) ; \
 	fi
-	if test ! -f $(srcdir)/$(GITVERSION_FILE) ; then \
-		cp -f $(GITVERSION_FILE_TMP) $(srcdir)/$(GITVERSION_FILE) ; \
+	if ! test -f $(srcdir)/$(GITVERSION_FILE) ; then \
+		cp -f $(srcdir)/$(GITVERSION_FILE_TMP) $(srcdir)/$(GITVERSION_FILE) ; \
 	fi
 	if test "`cat $(GITVERSION_FILE_TMP)`" != "`cat $(srcdir)/$(GITVERSION_FILE)`" ; then \
 		cp -f $(GITVERSION_FILE_TMP) $(srcdir)/$(GITVERSION_FILE) ; \
diff --git a/mediastreamer2 b/mediastreamer2
index e52358830..ad85a23f7 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit e5235883089d64b42cbefa8cd3d42f65af3bf67a
+Subproject commit ad85a23f7b17a8d3942eadf9f210ffab58ccf189