diff --git a/ChangeLog b/ChangeLog
index e8710e6a0..ecf8384d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-24  Don Allingham  <don@gramps-project.org>
+	* src/GrampsDbUtils/_WriteGedcom.py: Generate LONG and LATI 
+	* src/docgen/Makefile.am: replace LPRDoc with GtkPrint
+	
 2007-08-24  Don Allingham  <don@gramps-project.org>
 	* src/Config/_GrampsConfigKeys.py: added coment on how do add a new
 	key
diff --git a/src/GrampsDbUtils/_WriteGedcom.py b/src/GrampsDbUtils/_WriteGedcom.py
index 9837f24d3..ca40f010b 100644
--- a/src/GrampsDbUtils/_WriteGedcom.py
+++ b/src/GrampsDbUtils/_WriteGedcom.py
@@ -1281,6 +1281,12 @@ class GedcomWriter(UpdateCallback):
     def write_place(self, place, level):
         place_name = place.get_title()
         self.__writeln(level, "PLAC", place_name.replace('\r', ' '))
+        long = place.get_longitude()
+        lat = place.get_latitude()
+        if long and lat:
+            self.__writeln(level+1, "MAP")
+            self.__writeln(level+2, 'LATI', lat)
+            self.__writeln(level+2, 'LONG', long)
 
 #-------------------------------------------------------------------------
 #
diff --git a/src/docgen/Makefile.am b/src/docgen/Makefile.am
index 75c0ecccd..38dcedd1d 100644
--- a/src/docgen/Makefile.am
+++ b/src/docgen/Makefile.am
@@ -18,7 +18,7 @@ docgen_PYTHON = \
 	PSDrawDoc.py\
 	RTFDoc.py\
 	SvgDrawDoc.py\
-	LPRDoc.py
+	GtkPrint.py
 
 # Clean up all the byte-compiled files
 MOSTLYCLEANFILES = *pyc *pyo