diff -Nru gedit-2.30.4/debian/changelog gedit-2.30.4/debian/changelog
--- gedit-2.30.4/debian/changelog	2010-10-15 09:50:13.000000000 -0400
+++ gedit-2.30.4/debian/changelog	2010-10-26 17:24:47.000000000 -0400
@@ -1,3 +1,11 @@
+gedit (2.30.4-1ubuntu2) natty; urgency=low
+
+  * 08_pythonconsole_gconf.patch: added to make sure python console
+    configuration dialog uses proper gconf class. Closes: LP #654867
+    Thanks to Jason Conti for the patch.
+
+ -- Jordan Mantha <laserjock@ubuntu.com>  Tue, 26 Oct 2010 17:05:19 -0400
+
 gedit (2.30.4-1ubuntu1) natty; urgency=low
 
   * Resynchronise on Debian
diff -Nru gedit-2.30.4/debian/patches/08_pythonconsole_gconf.patch gedit-2.30.4/debian/patches/08_pythonconsole_gconf.patch
--- gedit-2.30.4/debian/patches/08_pythonconsole_gconf.patch	1969-12-31 19:00:00.000000000 -0500
+++ gedit-2.30.4/debian/patches/08_pythonconsole_gconf.patch	2010-10-26 17:25:16.000000000 -0400
@@ -0,0 +1,26 @@
+Description: Patch to fix ubuntu bug #654867
+ This patch fixes ubuntu bug #654867 by making sure the PythonConsoleConfig
+ gconf class is used in the python console plugin configuration dialog.
+ Patch created by Jason Conti
+
+Bug-Ubuntu: https://launchpad.net/bugs/654867
+--- a/plugins/pythonconsole/pythonconsole/config.py-backup	2010-10-04 17:37:27.634246001 -0400
++++ b/plugins/pythonconsole/pythonconsole/config.py	2010-10-04 17:38:39.034246002 -0400
+@@ -68,7 +68,7 @@
+             return default
+ 
+         val = PythonConsoleConfig.gconf.client_get_default().get(key)
+-        if val is not None and val.type == gconf.VALUE_STRING:
++        if val is not None and val.type == PythonConsoleConfig.gconf.VALUE_STRING:
+             return val.get_string()
+         else:
+             return default
+@@ -78,7 +78,7 @@
+         if not PythonConsoleConfig.gconf:
+             return
+ 
+-        v = PythonConsoleConfig.gconf.Value(gconf.VALUE_STRING)
++        v = PythonConsoleConfig.gconf.Value(PythonConsoleConfig.gconf.VALUE_STRING)
+         v.set_string(value)
+         PythonConsoleConfig.gconf.client_get_default().set(key, v)
+ 
diff -Nru gedit-2.30.4/debian/patches/series gedit-2.30.4/debian/patches/series
--- gedit-2.30.4/debian/patches/series	2010-10-15 09:50:13.000000000 -0400
+++ gedit-2.30.4/debian/patches/series	2010-10-26 18:17:09.000000000 -0400
@@ -5,4 +5,5 @@
 05_menu_label.patch
 06_lp_401692.patch
 07_intltool.patch
+08_pythonconsole_gconf.patch
 99_ltmain_as-needed.patch