diff --git a/ChangeLog b/ChangeLog
index ace22ac7a1..f7e6255bd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-08-22  Stefan Kost  <ensonic@users.sf.net>
+
+	* docs/plugins/gst-plugins-bad-plugins-docs.sgml:
+	  Add, but commented out xml/element-dc1394.xml. Its documented, but
+	  I can't get it to be build.
+
+	* ext/celt/gstceltdec.c:
+	* ext/celt/gstceltenc.c:
+	  Fix doc warnings and reformat the doc block.
+
 2008-08-21  Stefan Kost  <ensonic@users.sf.net>
 
 	patch by: Leandro Melo de Sales <leandroal@gmail.com>
diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
index 157c5775a0..9167ce2fb4 100644
--- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml
@@ -18,6 +18,7 @@
     <xi:include href="xml/element-audioparse.xml" />
     <xi:include href="xml/element-celtdec.xml" />
     <xi:include href="xml/element-celtenc.xml" />
+    <!--xi:include href="xml/element-dc1394.xml" /-->
     <xi:include href="xml/element-dccpclientsink.xml" />
     <xi:include href="xml/element-dccpclientsrc.xml" />
     <xi:include href="xml/element-dccpserversink.xml" />
diff --git a/ext/celt/gstceltdec.c b/ext/celt/gstceltdec.c
index 25f99b19a6..c14f787d3a 100644
--- a/ext/celt/gstceltdec.c
+++ b/ext/celt/gstceltdec.c
@@ -25,20 +25,15 @@
 
 /**
  * SECTION:element-celtdec
- * @short_description: a decoder that decodes CELT to raw audio
  * @see_also: celtenc, oggdemux
  *
- * <refsect2>
- * <para>
  * This element decodes a CELT stream to raw integer audio.
- * </para>
+ *
+ * <refsect2>
  * <title>Example pipelines</title>
- * <para>
- * <programlisting>
+ * |[
  * gst-launch -v filesrc location=celt.ogg ! oggdemux ! celtdec ! audioconvert ! audioresample ! alsasink
- * </programlisting>
- * Decode an Ogg/Celt file. To create an Ogg/Celt file refer to the documentation of celtenc.
- * </para>
+ * ]| Decode an Ogg/Celt file. To create an Ogg/Celt file refer to the documentation of celtenc.
  * </refsect2>
  */
 
diff --git a/ext/celt/gstceltenc.c b/ext/celt/gstceltenc.c
index 7723f7cbf9..0154a26c05 100644
--- a/ext/celt/gstceltenc.c
+++ b/ext/celt/gstceltenc.c
@@ -24,20 +24,15 @@
 
 /**
  * SECTION:element-celtenc
- * @short_description: an encoder that encodes raw audio to CELT
  * @see_also: celtdec, oggmux
  *
- * <refsect2>
- * <para>
  * This element raw audio to CELT.
- * </para>
+ *
+ * <refsect2>
  * <title>Example pipelines</title>
- * <para>
- * <programlisting>
+ * |[
  * gst-launch -v audiotestsrc wave=sine num-buffers=100 ! audioconvert ! celtenc ! oggmux ! filesink location=sine.ogg
- * </programlisting>
- * Encode a test sine signal to Ogg/CELT.
- * </para>
+ * ]| Encode a test sine signal to Ogg/CELT.
  * </refsect2>
  */