diff --git a/ChangeLog b/ChangeLog
index 13e27375d0..d04e5dfc6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* Makefile.am:
+	* gst-ffmpeg.doap:
+	* gst-ffmpeg.spec.in:
+	  add doap file
+
 2006-12-15  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* Makefile.am:
diff --git a/Makefile.am b/Makefile.am
index e61696d605..633c40b899 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = $(FFMPEG_SUBDIRS) ext docs common tests
 
 EXTRA_DIST = \
 	gst-ffmpeg.spec depcomp \
-	AUTHORS COPYING NEWS README ChangeLog
+	AUTHORS COPYING NEWS README ChangeLog gst-ffmpeg.doap
 
 ACLOCAL_AMFLAGS = -I common/m4
 
diff --git a/gst-ffmpeg.doap b/gst-ffmpeg.doap
new file mode 100644
index 0000000000..d18581503d
--- /dev/null
+++ b/gst-ffmpeg.doap
@@ -0,0 +1,170 @@
+<Project
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
+  xmlns="http://usefulinc.com/ns/doap#"
+  xmlns:foaf="http://xmlns.com/foaf/0.1/"
+  xmlns:admin="http://webns.net/mvcb/">
+
+ <name>GStreamer FFmpeg Plug-ins</name>
+ <shortname>gst-ffmpeg</shortname>
+ <homepage rdf:resource="http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html" />
+ <created>2004-02-26</created>
+ <shortdesc xml:lang="en">
+a plug-in using the FFmpeg library
+</shortdesc>
+ <description xml:lang="en">
+GStreamer FFmpeg plug-in contains  elements using the FFmpeg library code. It
+contains most popular decoders as well as very fast
+colorspace conversion elements.
+ </description>
+ <category></category>
+ <bug-database rdf:resource="http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer&amp;component=gst-ffmpeg" />
+ <screenshots></screenshots>
+ <mailing-list rdf:resource="http://lists.sourceforge.net/lists/listinfo/gstreamer-devel/" />
+ <programming-language>C</programming-language>
+ <license rdf:resource="http://usefulinc.com/doap/licenses/lgpl"/>
+ <download-page rdf:resource="http://gstreamer.freedesktop.org/download/" />
+
+ <repository>
+   <CVSRepository>
+     <anon-root>:pserver:anonymous@cvs.freedesktop.org:/cvs/gstreamer</anon-root>
+     <module>gst-ffmpeg</module>
+     <browse rdf:resource="http://webcvs.freedesktop.org/gstreamer/gst-ffmpeg/" />
+   </CVSRepository>
+ </repository> 
+
+ <release>
+  <Version>
+   <revision>0.10.2</revision>
+   <branch>0.10</branch>
+   <name>At the edge of Taymans</name>
+   <created>2006-12-31</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.2.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.2.tar.gz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>0.10.1</revision>
+   <branch>0.10</branch>
+   <name>Late Train</name>
+   <created>2006-03-31</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.1.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.1.tar.gz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>0.10.0</revision>
+   <branch>0.10</branch>
+   <name>Rocamadour</name>
+   <created>2005-12-05</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.0.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.0.tar.gz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>0.8.7</revision>
+   <branch>0.8</branch>
+   <name>Redneck soup</name>
+   <created>2005-10-25</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.7.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.7.tar.gz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>0.8.6</revision>
+   <branch>0.8</branch>
+   <name>Vamoz a la Playa</name>
+   <created>2005-08-05</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.6.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.6.tar.gz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>0.8.5</revision>
+   <branch>0.8</branch>
+   <name>For the better of the world</name>
+   <created>2005-06-11</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.5.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.5.tar.gz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>0.8.4</revision>
+   <branch>0.8</branch>
+   <name>Mellow on my fingers</name>
+   <created>2005-03-11</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.4.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.4.tar.gz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>0.8.3</revision>
+   <branch>0.8</branch>
+   <name>Tiny Piece of Plastic</name>
+   <created>2004-12-27</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.3.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.3.tar.gz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>0.8.2</revision>
+   <branch>0.8</branch>
+   <name>Titan Shifting Gears</name>
+   <created>2004-10-09</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.2.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.2.tar.gz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>0.8.1</revision>
+   <branch>0.8</branch>
+   <name>Just Another Victim</name>
+   <created>2004-07-16</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.1.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.1.tar.gz" />
+  </Version>
+ </release>
+
+ <release>
+  <Version>
+   <revision>0.8.0</revision>
+   <branch>0.8</branch>
+   <name>In Buildings</name>
+   <created>2004-03-16</created>
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.0.tar.bz2" />
+   <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.8.0.tar.gz" />
+  </Version>
+ </release>
+
+
+ <maintainer>
+  <foaf:Person>
+     <foaf:name>Wim Taymans</foaf:name>
+     <foaf:mbox_sha1sum>0d93fde052812d51a05fd86de9bdbf674423daa2</foaf:mbox_sha1sum>
+  </foaf:Person>
+ </maintainer>
+ <maintainer>
+  <foaf:Person>
+     <foaf:name>Thomas Vander Stichele</foaf:name>
+  </foaf:Person>
+ </maintainer>
+
+</Project>
diff --git a/gst-ffmpeg.spec.in b/gst-ffmpeg.spec.in
index 8ddf336ecd..5627e28e48 100644
--- a/gst-ffmpeg.spec.in
+++ b/gst-ffmpeg.spec.in
@@ -50,17 +50,17 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_majorminor}/*.a
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-
-%postun
-
 %files
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING README
+%doc AUTHORS COPYING README gst-ffmpeg.doap
 %{_libdir}/gstreamer-%{gst_majorminor}/libgstffmpeg.so
 %{_libdir}/gstreamer-%{gst_majorminor}/libgstpostproc.so
 
 %changelog
+* Fri Dec 15 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- clean up
+- add doap file
+
 * Wed Oct 05 2004 Christian Schaller <christian at fluendo dot com>
 - Update SPEC file to fit the times