diff --git a/gst/jpegformat/gstjifmux.c b/gst/jpegformat/gstjifmux.c
index 4fc6b71906..15e26f9950 100644
--- a/gst/jpegformat/gstjifmux.c
+++ b/gst/jpegformat/gstjifmux.c
@@ -24,7 +24,9 @@
  * SECTION:element-jifmux
  * @short_description: JPEG interchange format writer
  *
- * Writes a JPEG image as JPEG/EXIF or JPEG/JFIF including various metadata.
+ * Writes a JPEG image as JPEG/EXIF or JPEG/JFIF including various metadata. The
+ * jpeg image received on the sink pad should be minimal (e.g. should not
+ * contain metadata already).
  *
  * <refsect2>
  * <title>Example launch line</title>
diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c
index 3a399bd60e..4217c6aff8 100644
--- a/gst/jpegformat/gstjpegparse.c
+++ b/gst/jpegformat/gstjpegparse.c
@@ -28,7 +28,7 @@
  * Parses a JPEG stream into JPEG images.  It looks for EOI boundaries to
  * split a continuous stream into single-frame buffers. Also reads the
  * image header searching for image properties such as width and height
- * among others.
+ * among others. Jpegparse can also extract metadata (e.g. xmp).
  *
  * <refsect2>
  * <title>Example launch line</title>
@@ -39,7 +39,11 @@
  * HTTP and stores it in a matroska file.
  * </refsect2>
  */
-
+/* FIXME: output plain JFIF APP marker only. This provides best code reuse.
+ * JPEG decoders would not need to handle this part anymore. Also when remuxing
+ * (... ! jpegparse ! ... ! jifmux ! ...) metadata consolidation would be
+ * easier.
+ */
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif