diff --git a/configure.ac b/configure.ac
index e8ac029012..52038b00e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -308,7 +308,6 @@ AG_GST_CHECK_PLUGIN(freeze)
 AG_GST_CHECK_PLUGIN(frei0r)
 AG_GST_CHECK_PLUGIN(gaudieffects)
 AG_GST_CHECK_PLUGIN(geometrictransform)
-AG_GST_CHECK_PLUGIN(h263parse)
 AG_GST_CHECK_PLUGIN(h264parse)
 AG_GST_CHECK_PLUGIN(hdvparse)
 AG_GST_CHECK_PLUGIN(id3tag)
@@ -345,6 +344,7 @@ AG_GST_CHECK_PLUGIN(stereo)
 AG_GST_CHECK_PLUGIN(tta)
 AG_GST_CHECK_PLUGIN(videomaxrate)
 AG_GST_CHECK_PLUGIN(videomeasure)
+AG_GST_CHECK_PLUGIN(videoparsers)
 AG_GST_CHECK_PLUGIN(videosignal)
 AG_GST_CHECK_PLUGIN(vmnc)
 AG_GST_CHECK_PLUGIN(y4m)
@@ -1728,7 +1728,6 @@ gst/freeze/Makefile
 gst/frei0r/Makefile
 gst/gaudieffects/Makefile
 gst/geometrictransform/Makefile
-gst/h263parse/Makefile
 gst/h264parse/Makefile
 gst/hdvparse/Makefile
 gst/id3tag/Makefile
@@ -1766,6 +1765,7 @@ gst/stereo/Makefile
 gst/tta/Makefile
 gst/videomaxrate/Makefile
 gst/videomeasure/Makefile
+gst/videoparsers/Makefile
 gst/videosignal/Makefile
 gst/vmnc/Makefile
 gst/y4m/Makefile
diff --git a/gst/h263parse/Makefile.am b/gst/videoparsers/Makefile.am
similarity index 79%
rename from gst/h263parse/Makefile.am
rename to gst/videoparsers/Makefile.am
index eda4c3840a..072e001524 100644
--- a/gst/h263parse/Makefile.am
+++ b/gst/videoparsers/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgsth263parse.la
 
-libgsth263parse_la_SOURCES = h263parse.c gsth263parse.c gstbaseparse.c
+libgsth263parse_la_SOURCES = plugin.c h263parse.c gsth263parse.c gstbaseparse.c
 libgsth263parse_la_CFLAGS = $(GST_CFLAGS)
 libgsth263parse_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgsth263parse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst/h263parse/gstbaseparse.c b/gst/videoparsers/gstbaseparse.c
similarity index 99%
rename from gst/h263parse/gstbaseparse.c
rename to gst/videoparsers/gstbaseparse.c
index ccb11fb3d8..8aa3f14fe6 100644
--- a/gst/h263parse/gstbaseparse.c
+++ b/gst/videoparsers/gstbaseparse.c
@@ -329,7 +329,7 @@ gst_base_parse_get_type (void)
     };
 
     base_parse_type = g_type_register_static (GST_TYPE_ELEMENT,
-        "GstH263BaseParseBad", &base_parse_info, G_TYPE_FLAG_ABSTRACT);
+        "GstBaseVideoParseBad", &base_parse_info, G_TYPE_FLAG_ABSTRACT);
   }
   return base_parse_type;
 }
@@ -460,7 +460,7 @@ gst_base_parse_class_init (GstBaseParseClass * klass)
   klass->src_event = gst_base_parse_src_eventfunc;
   klass->convert = gst_base_parse_convert_default;
 
-  GST_DEBUG_CATEGORY_INIT (gst_base_parse_debug, "h263baseparse", 0,
+  GST_DEBUG_CATEGORY_INIT (gst_base_parse_debug, "basevideoparse", 0,
       "baseparse element");
 }
 
diff --git a/gst/h263parse/gstbaseparse.h b/gst/videoparsers/gstbaseparse.h
similarity index 100%
rename from gst/h263parse/gstbaseparse.h
rename to gst/videoparsers/gstbaseparse.h
diff --git a/gst/h263parse/gsth263parse.c b/gst/videoparsers/gsth263parse.c
similarity index 97%
rename from gst/h263parse/gsth263parse.c
rename to gst/videoparsers/gsth263parse.c
index 6e4b701b3e..b727f6212e 100644
--- a/gst/h263parse/gsth263parse.c
+++ b/gst/videoparsers/gsth263parse.c
@@ -357,16 +357,3 @@ out:
   g_free (params);
   return res;
 }
-
-static gboolean
-plugin_init (GstPlugin * plugin)
-{
-  return gst_element_register (plugin, "h263parse",
-      GST_RANK_NONE, GST_TYPE_H263PARSE);
-}
-
-GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
-    GST_VERSION_MINOR,
-    "h263parse",
-    "Element for parsing raw h263 streams",
-    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/gst/h263parse/gsth263parse.h b/gst/videoparsers/gsth263parse.h
similarity index 100%
rename from gst/h263parse/gsth263parse.h
rename to gst/videoparsers/gsth263parse.h
diff --git a/gst/h263parse/h263parse.c b/gst/videoparsers/h263parse.c
similarity index 100%
rename from gst/h263parse/h263parse.c
rename to gst/videoparsers/h263parse.c
diff --git a/gst/h263parse/h263parse.h b/gst/videoparsers/h263parse.h
similarity index 100%
rename from gst/h263parse/h263parse.h
rename to gst/videoparsers/h263parse.h
diff --git a/gst/videoparsers/plugin.c b/gst/videoparsers/plugin.c
new file mode 100644
index 0000000000..b6d29c459b
--- /dev/null
+++ b/gst/videoparsers/plugin.c
@@ -0,0 +1,42 @@
+/* GStreamer video parsers
+ * Copyright (C) 2011 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gsth263parse.h"
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  gboolean ret;
+
+  ret = gst_element_register (plugin, "h263parse",
+      GST_RANK_NONE, GST_TYPE_H263_PARSE);
+
+  return ret;
+}
+
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "videoparsersbad",
+    "videoparsers",
+    plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN);