diff --git a/src/StartupDialog.py b/src/StartupDialog.py
index 018bdf250..5fb5e80f0 100644
--- a/src/StartupDialog.py
+++ b/src/StartupDialog.py
@@ -22,7 +22,12 @@ import const
 import gtk.glade
 import gnome
 import gnome.ui
-import gconf
+
+try:
+    import gconf
+except ImportError:
+    import gnome.gconf
+    gconf = gnome.gconf
 
 from gettext import gettext as _
 
diff --git a/src/gramps.py b/src/gramps.py
index e387e089f..5d464ca38 100755
--- a/src/gramps.py
+++ b/src/gramps.py
@@ -18,19 +18,31 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+#-------------------------------------------------------------------------
+#
+# Python modules
+#
+#-------------------------------------------------------------------------
 import sys
 import os
 import locale
 import signal
+import gettext
 
+#-------------------------------------------------------------------------
+#
+# pygtk
+#
+#-------------------------------------------------------------------------
 try:
     import pygtk
     pygtk.require('2.0')
 except ImportError:
     pass
 
+import gtk.gdk
+import gtk
 import gtk.glade
-import gettext
 
 #-------------------------------------------------------------------------
 #
@@ -52,17 +64,8 @@ except:
     pass
 
 gettext.textdomain("gramps")
-
 gettext.install("gramps",loc,unicode=1)
 
-#-------------------------------------------------------------------------
-#
-# Cope with versioned pygtk installation.
-#
-#-------------------------------------------------------------------------
-
-import gtk
-
 #-------------------------------------------------------------------------
 #
 # gramps libraries
@@ -70,7 +73,6 @@ import gtk
 #-------------------------------------------------------------------------
 import gramps_main 
 
-
 signal.signal(signal.SIGCHLD, signal.SIG_DFL)
 
 args = sys.argv[1:]