diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 1f470ec90..1c5281549 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,6 @@
+2005-10-18  Julio Sanchez  <jsanchez@users.sourceforge.net>
+	* src/WriteGedcom.py: Add description and notes for media objects
+
 2005-10-17  Stefan Bjork  <skalman@acc.umu.se>
 	* src/po/template.po: Broken and recreated.
 
diff --git a/gramps2/src/WriteGedcom.py b/gramps2/src/WriteGedcom.py
index 1d1b0917c..19d61935c 100644
--- a/gramps2/src/WriteGedcom.py
+++ b/gramps2/src/WriteGedcom.py
@@ -994,10 +994,13 @@ class GedcomWriter:
                         
                     self.writeln('1 OBJE')
                     self.writeln('2 FORM jpeg')
+                    self.writeln('2 TITL %s' % photo_obj.get_description())
                     dirname = os.path.join (self.dirname, self.images_path)
                     basename = os.path.basename (path)
                     self.writeln('2 FILE %s' % os.path.join(self.images_path,
                                                            basename))
+                    if photo_obj.get_note():
+                        self.write_long_text("NOTE",2,self.cnvtxt(photo_obj.get_note()))
 
 
         for family in person.get_parent_family_handle_list():