diff --git a/configure.ac b/configure.ac
index be45f77602..fca5cd9e2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -297,9 +297,10 @@ if test "$enable_builtin_codecparsers" = "yes"; then
     ac_cv_have_gst_mpeg2_parser="no"
     ac_cv_have_gst_h264_parser="no"
     ac_cv_have_gst_jpeg_parser="no"
-fi
+else
 PKG_CHECK_MODULES([GST_CODEC_PARSERS],
     [gstreamer-codecparsers-$GST_API_VERSION >= $GST_PLUGINS_BAD_VERSION_REQUIRED])
+fi
 
 dnl ... MPEG-2 parser, with the required extensions
 AC_CACHE_CHECK([for MPEG-2 parser],
diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am
index a09a8fd4e1..c0581e3cbe 100644
--- a/gst-libs/gst/codecparsers/Makefile.am
+++ b/gst-libs/gst/codecparsers/Makefile.am
@@ -21,9 +21,9 @@ libgstvaapi_codecparsers_libs =			\
 gen_source_c = parserutils.c
 gen_source_h = parserutils.h
 
-# Always build VC-1 parser for now
-gen_source_c += gstvc1parser.c
-gen_source_h += gstvc1parser.h
+# Always build VC-1 and MPEG-4 parsers for now
+gen_source_c += gstvc1parser.c gstmpeg4parser.c
+gen_source_h += gstvc1parser.h gstmpeg4parser.h
 
 if USE_LOCAL_CODEC_PARSERS_JPEG
 gen_source_c += gstjpegparser.c