diff --git a/seahorse.changes b/seahorse.changes
index 0adc630..3a4f809 100644
--- a/seahorse.changes
+++ b/seahorse.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb  5 01:00:56 CET 2007 - ro@suse.de
+
+- GNOME moved to /usr 
+
 -------------------------------------------------------------------
 Thu Dec  7 15:27:10 CET 2006 - sbrabec@suse.cz
 
diff --git a/seahorse.spec b/seahorse.spec
index d4e4778..7c193a3 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package seahorse (Version 0.8)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,14 +12,12 @@
 
 Name:           seahorse
 BuildRequires:  gnome-themes gpgme-devel intltool libglade2-devel libgnomeprintui-devel libsoup-devel libwnck-devel mDNSResponder-devel nautilus-devel openldap2 openldap2-devel perl-XML-Parser update-desktop-files
-%define prefix   /opt/gnome
-%define sysconfdir /etc%{prefix}
 License:        GNU General Public License (GPL)
 Group:          System/GUI/GNOME
 Autoreqprov:    on
 PreReq:         gconf2
 Version:        0.8
-Release:        50
+Release:        60
 Summary:        GNOME2 interface for gnupg
 Source:         ftp://ftp.gnome.org/pub/gnome/sources/seahorse/%{name}-%{version}.tar.bz2
 Patch:          %{name}-uninited.patch
@@ -50,13 +48,13 @@ rename no nb po/no.*
 sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && mv configure.in.tmp configure.in
 %{?suse_update_config:%{suse_update_config -f}}
 autoreconf -f -i
-CFLAGS="$RPM_OPT_FLAGS -I/opt/gnome/include -fno-strict-aliasing -DLDAP_DEPRECATED" \
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED" \
   ./configure \
-    --prefix=%prefix \
-    --libdir=%prefix/%_lib \
-    --sysconfdir=%sysconfdir \
-    --libexecdir=%{prefix}/lib/seahorse \
-    --mandir=%prefix/share/man \
+    --prefix=%{_prefix} \
+    --libdir=%{_libdir} \
+    --sysconfdir=%{_sysconfdir} \
+    --libexecdir=%{_prefix}/lib/seahorse \
+    --mandir=%{_mandir} \
     --localstatedir=/var/%_lib \
     --disable-gedit
 make 
@@ -66,30 +64,35 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make -i install DESTDIR=$RPM_BUILD_ROOT
 #remove the stuff we don't want
 rm -rf $RPM_BUILD_ROOT/var/%_lib/scrollkeeper
-rm -rf $RPM_BUILD_ROOT%{prefix}/%{_lib}/lib*.*a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.*a
 ( cd ${RPM_BUILD_ROOT}/%{_datadir}/mime/ && rm -rf XMLnamespaces globs mime application magic )
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL 
 %find_lang %{name}
 %suse_update_desktop_file %{name} Security
 %suse_update_desktop_file %{name}-pgp-preferences Security
 # Hack to work around check for installed icons in .desktop files
-mkdir -p $RPM_BUILD_ROOT%{prefix}/share/pixmaps
-cp %{prefix}/share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp-keys.png \
-$RPM_BUILD_ROOT%{prefix}/share/pixmaps/gnome-mime-application-pgp-keys.png
-rm $RPM_BUILD_ROOT%{prefix}/%{_lib}/nautilus/extensions-1.0/libnautilus-seahorse.*a
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/pixmaps
+cp %{_prefix}/share/icons/HighContrastLargePrint/48x48/mimetypes/gnome-mime-application-pgp-keys.png \
+$RPM_BUILD_ROOT%{_prefix}/share/pixmaps/gnome-mime-application-pgp-keys.png
+rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.*a
+%find_gconf_schemas
+
+%pre -f %{name}.schemas_pre
+
+%posttrans -f %{name}.schemas_posttrans
+
+%preun -f %{name}.schemas_preun
 
 %post
 %run_ldconfig
-export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source` 
-opt/gnome/bin/gconftool-2 --makefile-install-rule etc/opt/gnome/gconf/schemas/%{name}.schemas >/dev/null
 if test -x usr/bin/update-mime-database ; then
-  usr/bin/update-mime-database %{prefix}/share/mime > /dev/null
+  usr/bin/update-mime-database %{_prefix}/share/mime > /dev/null
 fi
 
 %postun
 %run_ldconfig
 if test -x usr/bin/update-mime-database ; then
-  usr/bin/update-mime-database %{prefix}/share/mime > /dev/null
+  usr/bin/update-mime-database %{_prefix}/share/mime > /dev/null
 fi
 
 %clean
@@ -99,18 +102,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
 %defattr (-, root, root)
-%{prefix}/bin/*
-%{prefix}/%{_lib}/*.so*
-%{prefix}/%{_lib}/nautilus/extensions-1.0/libnautilus-seahorse.so
-%{prefix}/share/applications/*.desktop
-%{prefix}/share/control-center-2.0
-%{prefix}/share/mime-info/*
-%{prefix}/share/pixmaps/*.png
-%{prefix}/share/seahorse
-%{sysconfdir}/gconf/schemas/%{name}.schemas
-%{prefix}/share/mime/packages/seahorse.xml
+%{_prefix}/bin/*
+%{_libdir}/*.so*
+%{_libdir}/nautilus/extensions-1.0/libnautilus-seahorse.so
+%{_prefix}/share/applications/*.desktop
+%{_prefix}/share/control-center-2.0
+%{_prefix}/share/mime-info
+%{_prefix}/share/pixmaps/*.png
+%{_prefix}/share/seahorse
+%{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_prefix}/share/mime/packages/seahorse.xml
 
 %changelog -n seahorse
+* Mon Feb 05 2007 - ro@suse.de
+- GNOME moved to /usr
 * Thu Dec 07 2006 - sbrabec@suse.cz
 - Fixed MIME database path in scriptlets (#225666).
 - Use correct PreReq.