diff --git a/ChangeLog b/ChangeLog
index 27a0ae5c32..32506e28f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-04  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* docs/plugins/Makefile.am:
+	* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
+	* docs/plugins/gst-plugins-bad-plugins-sections.txt:
+	* docs/plugins/inspect/plugin-video4linux2.xml:
+	* gst-plugins-bad.spec.in:
+	  removed v4l2
+
 2006-10-03  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac:
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index e7239d5d03..e6120339c8 100644
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -91,8 +91,7 @@ EXTRA_HFILES = \
 	$(top_srcdir)/ext/wavpack/gstwavpackdec.h \
 	$(top_srcdir)/ext/wavpack/gstwavpackenc.h \
 	$(top_srcdir)/ext/wavpack/gstwavpackparse.h \
-	$(top_srcdir)/gst/videocrop/gstvideocrop.h \
-	$(top_srcdir)/sys/v4l2/gstv4l2src.h
+	$(top_srcdir)/gst/videocrop/gstvideocrop.h
 
 # Images to copy into HTML directory.
 HTML_IMAGES =
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index f382b66c33..5fc2344bc8 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -19,7 +19,6 @@
     <xi:include href="xml/element-wavpackdec.xml" />
     <xi:include href="xml/element-wavpackenc.xml" />
     <xi:include href="xml/element-wavpackparse.xml" />
-    <xi:include href="xml/element-v4l2src.xml" />
   </chapter>
 
   <chapter>
@@ -43,7 +42,6 @@
     <xi:include href="xml/plugin-spectrum.xml" />
     <xi:include href="xml/plugin-speed.xml" />
     <xi:include href="xml/plugin-tta.xml" />
-    <xi:include href="xml/plugin-video4linux2.xml" />
     <xi:include href="xml/plugin-videocrop.xml" />
     <xi:include href="xml/plugin-wavpack.xml" />
     <xi:include href="xml/plugin-xingheader.xml" />
diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt
index f2b96546c6..8b0fad1b35 100644
--- a/docs/plugins/gst-plugins-bad-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt
@@ -14,25 +14,6 @@ GstTRM
 GstTRMClass
 </SECTION>
 
-<SECTION>
-<FILE>element-v4l2src</FILE>
-GstV4l2Src
-<TITLE>v4l2src</TITLE>
-<SUBSECTION Standard>
-GST_V4L2_MAX_BUFFERS
-GST_V4L2_MIN_BUFFERS
-GstV4l2BufferPool
-GstV4l2Buffer
-GstV4l2Src
-GstV4l2SrcClass
-GST_V4L2SRC
-GST_IS_V4L2SRC
-GST_TYPE_V4L2SRC
-gst_v4l2src_get_type
-GST_V4L2SRC_CLASS
-GST_IS_V4L2SRC_CLASS
-</SECTION>
-
 <SECTION>
 <FILE>element-videocrop</FILE>
 GstVideoCrop
diff --git a/docs/plugins/inspect/plugin-video4linux2.xml b/docs/plugins/inspect/plugin-video4linux2.xml
deleted file mode 100644
index e310e2554d..0000000000
--- a/docs/plugins/inspect/plugin-video4linux2.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<plugin>
-  <name>video4linux2</name>
-  <description>elements for Video 4 Linux</description>
-  <filename>../../sys/v4l2/.libs/libgstvideo4linux2.so</filename>
-  <basename>libgstvideo4linux2.so</basename>
-  <version>0.10.3.1</version>
-  <license>LGPL</license>
-  <source>gst-plugins-bad</source>
-  <package>GStreamer Bad Plug-ins CVS/prerelease</package>
-  <origin>Unknown package origin</origin>
-  <elements>
-    <element>
-      <name>v4l2src</name>
-      <longname>Video (video4linux2/raw) Source</longname>
-      <class>Source/Video</class>
-      <description>Reads raw frames from a video4linux2 (BT8x8) device</description>
-      <author>Ronald Bultje &lt;rbultje@ronald.bitfreak.net&gt;, Edgard Lima &lt;edgard.lima@indt.org.br&gt;</author>
-    </element>
-  </elements>
-</plugin>
\ No newline at end of file
diff --git a/gst-plugins-bad.spec.in b/gst-plugins-bad.spec.in
index 870b6abac8..aa500f2594 100644
--- a/gst-plugins-bad.spec.in
+++ b/gst-plugins-bad.spec.in
@@ -69,7 +69,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majorminor}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
-# %find_lang gst-plugins-bad-%{majorminor}
+%find_lang gst-plugins-bad-%{majorminor}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -78,7 +78,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun
 
-%files
+%files -f gst-plugins-bad-%{majorminor}
+
 %defattr(-, root, root)
 %doc AUTHORS COPYING README REQUIREMENTS
 
@@ -107,14 +108,11 @@ rm -rf $RPM_BUILD_ROOT
 @USE_LIBMMS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmms.so
 @USE_XVID_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstxvid.so
 @USE_BZ2_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstbz2.so
-@USE_GST_V4L2_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstvideo4linux2.so
 @USE_WAVPACK_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstwavpack.so
 @USE_IVORBIS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstivorbis.so
 @USE_NEON_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstneonhttpsrc.so
 @USE_ALSA_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstalsaspdif.so
 
-%{_datadir}/locale
-
 %changelog
 * Sun Nov 27 2005 Thomas Vander Stichele <thomas at apestaart dot org>
 - redone for split