diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 862dc66f9..e7efa3143 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-28  Don Allingham  <don@gramps-project.org>
+	* src/RelLib/_Name.py: pyflakes fixes
+	* src/Editors/_EditName.py: pyflakes fixes
+	* src/DisplayTabs/_BackRefModel.py: pyflakes fixes
+	* src/DisplayTabs/_GalleryTab.py: pyflakes fixes
+
 2006-08-28  Alex Roitman  <shura@gramps-project.org>
 	* src/RelLib/_Address.py (get_text_data_list): Typo.
 	* src/Filters/Rules/Person/_HasTextMatchingSubstringOf.py (apply):
diff --git a/gramps2/src/DisplayTabs/_BackRefModel.py b/gramps2/src/DisplayTabs/_BackRefModel.py
index 2a66d2f73..0768bb874 100644
--- a/gramps2/src/DisplayTabs/_BackRefModel.py
+++ b/gramps2/src/DisplayTabs/_BackRefModel.py
@@ -28,6 +28,8 @@
 import gobject
 import gtk
 
+from gettext import gettext as _
+
 #-------------------------------------------------------------------------
 #
 # GRAMPS classes
diff --git a/gramps2/src/DisplayTabs/_GalleryTab.py b/gramps2/src/DisplayTabs/_GalleryTab.py
index fdf5e3397..118be9dcc 100644
--- a/gramps2/src/DisplayTabs/_GalleryTab.py
+++ b/gramps2/src/DisplayTabs/_GalleryTab.py
@@ -45,7 +45,6 @@ import os
 import RelLib
 import Utils
 import ImgManip
-import Mime
 import Errors
 import Mime
 from DdTargets import DdTargets
diff --git a/gramps2/src/Editors/_EditName.py b/gramps2/src/Editors/_EditName.py
index d2e2f4adb..9efe8e8a8 100644
--- a/gramps2/src/Editors/_EditName.py
+++ b/gramps2/src/Editors/_EditName.py
@@ -41,7 +41,6 @@ import gtk.glade
 #-------------------------------------------------------------------------
 import const
 import Utils
-import RelLib
 import NameDisplay
 from _EditSecondary import EditSecondary
 
diff --git a/gramps2/src/RelLib/_Name.py b/gramps2/src/RelLib/_Name.py
index 309e6ff5a..f5ac85313 100644
--- a/gramps2/src/RelLib/_Name.py
+++ b/gramps2/src/RelLib/_Name.py
@@ -24,13 +24,6 @@
 Name class for GRAMPS
 """
 
-#-------------------------------------------------------------------------
-#
-# Python modules
-#
-#-------------------------------------------------------------------------
-from gettext import gettext as _
-
 #-------------------------------------------------------------------------
 #
 # GRAMPS modules