diff --git a/gedit-gsettings-migration.patch b/gedit-gsettings-migration.patch
index 9bf7b15..b1e9b61 100644
--- a/gedit-gsettings-migration.patch
+++ b/gedit-gsettings-migration.patch
@@ -1,6 +1,6 @@
-diff -up gedit-2.31.2/data/gedit.convert.gsettings-migration gedit-2.31.2/data/gedit.convert
---- gedit-2.31.2/data/gedit.convert.gsettings-migration	2010-05-27 21:27:37.942675840 -0400
-+++ gedit-2.31.2/data/gedit.convert	2010-05-27 21:27:27.434675421 -0400
+diff -up gedit-2.31.5/data/gedit.convert.gsettings-migration gedit-2.31.5/data/gedit.convert
+--- gedit-2.31.5/data/gedit.convert.gsettings-migration	2010-07-14 10:51:07.169956001 -0400
++++ gedit-2.31.5/data/gedit.convert	2010-07-14 10:51:07.169956001 -0400
 @@ -0,0 +1,47 @@
 +[org.gnome.gedit.preferences.editor]
 +use-default-font = /apps/gedit-2/preferences/editor/font/use_default_font
@@ -49,11 +49,11 @@ diff -up gedit-2.31.2/data/gedit.convert.gsettings-migration gedit-2.31.2/data/g
 +
 +[org.gnome.gedit.plugins]
 +active-plugins = /apps/gedit-2/plugins/active-plugins
-diff -up gedit-2.31.2/data/Makefile.am.gsettings-migration gedit-2.31.2/data/Makefile.am
---- gedit-2.31.2/data/Makefile.am.gsettings-migration	2010-05-27 21:27:49.415675071 -0400
-+++ gedit-2.31.2/data/Makefile.am	2010-05-27 21:28:38.157675632 -0400
+diff -up gedit-2.31.5/data/Makefile.am.gsettings-migration gedit-2.31.5/data/Makefile.am
+--- gedit-2.31.5/data/Makefile.am.gsettings-migration	2010-07-06 06:33:40.000000000 -0400
++++ gedit-2.31.5/data/Makefile.am	2010-07-14 10:52:46.159956002 -0400
 @@ -26,6 +26,9 @@ gsettings_SCHEMAS = org.gnome.gedit.gsch
- @INTLTOOL_XML_NOMERGE_RULE@
+ 
  @GSETTINGS_RULES@
  
 +convertdir = $(datadir)/GConf/gsettings
diff --git a/gedit.spec b/gedit.spec
index bef9068..3bab471 100644
--- a/gedit.spec
+++ b/gedit.spec
@@ -109,9 +109,9 @@ intltoolize -f
 %build
 %configure \
 	--disable-scrollkeeper \
-	--disable-gtk-doc \
-	--enable-python
-make
+        --disable-introspection \
+	--disable-gtk-doc
+make %{_smp_mflags}
 
 # strip unneeded translations from .mo files
 # ideally intltool (ha!) would do that for us
@@ -136,9 +136,8 @@ desktop-file-install --delete-original       	\
   $RPM_BUILD_ROOT%{_datadir}/applications/*
 
 ## clean up all the static libs for plugins (workaround for no -module)
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins -name "*.a"`
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugins -name "*.la"`
-/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir}/gedit-2/plugin-loaders -name "*.la"`
+/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir} -name "*.a"`
+/bin/rm -f `find $RPM_BUILD_ROOT%{_libdir} -name "*.la"`
 
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
@@ -179,23 +178,30 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %files -f %{name}.lang
 %defattr(-, root, root)
 %doc README COPYING AUTHORS
-%{_datadir}/gedit-2
+%{_datadir}/gedit
 %{_datadir}/applications/gedit.desktop
 %{_mandir}/man1/*
-%{_libdir}/gedit-2
-%{_libexecdir}/gedit-2
+%{_libdir}/gedit
+%{_libdir}/libgedit-private.so.*
+%{_libexecdir}/gedit
 %{_bindir}/*
 %{_datadir}/GConf/gsettings
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.filebrowser.enums.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.gedit.time.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.gedit.file-browser.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.plugins.time.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.gedit.pythonconsole.gschema.xml
 %{_datadir}/dbus-1/services/org.gnome.gedit.service
 
 
 %files devel
 %defattr(-, root, root)
 %{_includedir}/gedit-3.0
-%{_libdir}/pkgconfig/gedit-3.0.pc
+
+%{_libdir}/libgedit-private.so
+%{_libdir}/pkgconfig/gedit.pc
 %{_datadir}/gtk-doc/html/gedit/