diff --git a/configure.ac b/configure.ac
index 728a2c6aa5..24ef2a4e4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,29 +214,29 @@ dnl ... bitstream parsers
 PKG_CHECK_MODULES([GST_CODEC_PARSERS],
     [gstreamer-codecparsers-$GST_MAJORMINOR >= gst_plugins_bad_version])
 
-dnl ... 0.10.23 addition, could be implemented otherwise
-AC_CACHE_CHECK([for GstH264SliceHdr::n_emulation_prevention_bytes],
-    ac_cv_have_gst_h264_slice_hdr_epb_count, [
-    saved_CFLAGS="$CFLAGS"
-    CFLAGS="$CFLAGS $GST_CFLAGS $GST_CODEC_PARSERS_CFLAGS"
+dnl ... H.264 parser, with the required extensions
+AC_CACHE_CHECK([for H.264 parser],
+    ac_cv_have_gst_h264_parser, [
+    saved_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS $GST_CFLAGS $GST_CODEC_PARSERS_CFLAGS"
     saved_LIBS="$LIBS"
     LIBS="$LIBS $GST_LIBS $GST_CODEC_PARSERS_LIBS"
     AC_COMPILE_IFELSE(
         [AC_LANG_PROGRAM(
             [[#include <gst/codecparsers/gsth264parser.h>]],
             [[GstH264SliceHdr slice_hdr;
-              slice_hdr.n_emulation_prevention_bytes = 0;]])],
-        [ac_cv_have_gst_h264_slice_hdr_epb_count="yes"],
-        [ac_cv_have_gst_h264_slice_hdr_epb_count="no"]
+              GstH264VUIParams vui_params;
+              slice_hdr.n_emulation_prevention_bytes = 0;
+              vui_params.par_n = 0;
+              vui_params.par_d = 0;]])],
+        [ac_cv_have_gst_h264_parser="yes"],
+        [ac_cv_have_gst_h264_parser="no"]
     )
-    CFLAGS="$saved_CFLAGS"
+    CPPFLAGS="$saved_CPPFLAGS"
     LIBS="$saved_LIBS"
 ])
-
-if test "$ac_cv_have_gst_h264_slice_hdr_epb_count" = "yes"; then
-    AC_DEFINE_UNQUOTED(HAVE_GST_H264_SLICE_HDR_EPB_COUNT, 1,
-        [Defined to 1 if GstH264SliceHdr::n_emulation_prevention_bytes exists.])
-fi
+AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_H264],
+    [test "$ac_cv_have_gst_h264_parser" != "yes"])
 
 dnl ... JPEG parser, not upstream yet
 AC_CACHE_CHECK([for JPEG parser],
diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am
index 4660a7dcff..48b93bc885 100644
--- a/gst-libs/gst/codecparsers/Makefile.am
+++ b/gst-libs/gst/codecparsers/Makefile.am
@@ -25,6 +25,11 @@ gen_source_c += gstjpegparser.c
 gen_source_h += gstjpegparser.h
 endif
 
+if USE_LOCAL_CODEC_PARSERS_H264
+gen_source_c += gsth264parser.c parserutils.c
+gen_source_h += gsth264parser.h parserutils.h
+endif
+
 GENFILES = \
 	$(gen_source_c)				\
 	$(gen_source_h)				\