diff --git a/common b/common
index a0c6a14dbc..959da4a43c 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit a0c6a14dbc3cb62bf513502eaef83d0600a7c1ca
+Subproject commit 959da4a43c2e6218eb4f43e8c7e29c1db4157db1
diff --git a/configure.ac b/configure.ac
index 1a2c08684a..b9d4425b1b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,6 @@ GST_PLUGINS_ALL="\
 	ffmpegcolorspace \
 	playback \
 	sine \
-	subparse \
 	tcp \
 	typefind \
 	videotestsrc \
@@ -160,7 +159,11 @@ AC_HEADER_STDC
 
 dnl used in gst/ffmpegcolorspace/mem.c
 dnl FIXME: could be fixed by redefining av_malloc and av_free to GLib's
-AC_CHECK_HEADER([malloc.h])
+AC_CHECK_HEADERS([malloc.h])
+
+dnl used in gst/subparse/gstsubparse.c
+AC_CHECK_HEADERS([regex.h], HAVE_REGEX_H="yes", HAVE_REGEX_H="no")
+AM_CONDITIONAL(HAVE_REGEX_H, test "x$HAVE_REGEX_H" = "xyes")
 
 dnl ffmpegcolorspace includes _stdint.h
 AX_CREATE_STDINT_H
diff --git a/gst/Makefile.am b/gst/Makefile.am
index 93522195dc..ee160a84d0 100644
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -1,2 +1,8 @@
-SUBDIRS = $(GST_PLUGINS_SELECTED)
-DIST_SUBDIRS = $(GST_PLUGINS_ALL)
+if HAVE_REGEX_H
+SUBPARSE = subparse
+else
+SUBPARSE =
+endif
+
+SUBDIRS = $(GST_PLUGINS_SELECTED) $(SUBPARSE)
+DIST_SUBDIRS = $(GST_PLUGINS_ALL) subparse