diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index 67502c8c0..023e26be0 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -81,6 +81,7 @@ liblinphone_la_SOURCES=\
 	ringtoneplayer.c \
 	sqlite3_bctbx_vfs.c sqlite3_bctbx_vfs.h\
 	factory.c \
+	payload_type.c \
 	$(GITVERSION_FILE)
 
 if BUILD_UPNP
diff --git a/mediastreamer2 b/mediastreamer2
deleted file mode 160000
index 954652074..000000000
--- a/mediastreamer2
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 954652074fd168323c0846d6d8cd6c5b4d859d75