diff --git a/ChangeLog b/ChangeLog
index ea9f0c3d8..9772d83f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 	* src/plugins/GraphViz.py.in: fix file open.
 	* src/plugins/Calendar.py: make calendar work in Windows
 	* src/GrampsLocale.py: make calendar work in Windows
+	* src/plugins/GraphViz.py: fix unicode encoding
 
 2006-05-21  Alex Roitman  <shura@gramps-project.org>
 	* src/GrampsDb/_GrampsBSDDB.py: Do not import unused module.
diff --git a/src/plugins/GraphViz.py b/src/plugins/GraphViz.py
index 494255bd1..3ee7688f7 100644
--- a/src/plugins/GraphViz.py
+++ b/src/plugins/GraphViz.py
@@ -238,7 +238,7 @@ class GraphViz:
         the_buffer = self.get_report()
         self.f = open(options_class.get_output(),'w')
         if self.latin:
-            self.f.write(the_buffer.encode('iso-8859-1'))
+            self.f.write(the_buffer.encode('iso-8859-1', 'replace'))
         else:
             self.f.write(the_buffer)
         self.f.close()
@@ -894,6 +894,7 @@ class GraphVizOptions(ReportOptions.ReportOptions):
         self.options_dict['incid'] = int(self.includeid_cb.get_active())
         self.options_dict['justyears'] = int(self.just_years_cb.get_active())
         self.options_dict['placecause'] = int(self.place_cause_cb.get_active())
+        self.options_dict['latin'] = int(self.latin_cb.get_active())
         self.options_dict['ratio'] = \
                 _options.ratio[self.ratio_box.get_active()][0]
         self.options_dict['rankdir'] = \