diff --git a/ChangeLog b/ChangeLog
index b2815bec2..d744412ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-02-02  Alex Roitman  <shura@gramps-project.org>
+	* src/plugins/WriteCD.py: Properly encode URI.
+
 2007-02-02  Don Allingham  <don@gramps-project.org>
 	* FAQ: update a bit.
 
diff --git a/src/plugins/WriteCD.py b/src/plugins/WriteCD.py
index 19b5b9178..e932f42ba 100644
--- a/src/plugins/WriteCD.py
+++ b/src/plugins/WriteCD.py
@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2000-2006  Donald N. Allingham
+# Copyright (C) 2000-2007  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -284,7 +284,9 @@ class PackageWriter:
                     select_clicked()
 
         # Write XML now
-        g = create('burn:///%s/data.gramps' % base,OPEN_WRITE )
+        uri = 'burn:///%s/data.gramps' % base
+        uri = uri.encode('utf8')
+        g = create(uri,OPEN_WRITE)
         gfile = XmlWriter(self.db,self.callback,2)
         gfile.write_handle(g)
         g.close()