diff --git a/gnome-terminal.changes b/gnome-terminal.changes
index fdf632e..9939b60 100644
--- a/gnome-terminal.changes
+++ b/gnome-terminal.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Mar  9 11:24:44 CET 2009 - vuntz@novell.com
+
+- Remove -fno-strict-aliasing from CFLAGS.
+- Do not add DocPath to desktop file: it's not needed by yelp.
+
 -------------------------------------------------------------------
 Tue Feb 17 01:00:22 CET 2009 - mboman@suse.de
 
diff --git a/gnome-terminal.spec b/gnome-terminal.spec
index 2e67c4c..48f0b83 100644
--- a/gnome-terminal.spec
+++ b/gnome-terminal.spec
@@ -24,6 +24,7 @@ BuildRequires:  gnome-doc-utils-devel
 BuildRequires:  intltool
 BuildRequires:  gconf2-devel
 BuildRequires:  dbus-1-glib-devel
+BuildRequires:  scrollkeeper
 BuildRequires:  startup-notification-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  vte-devel
@@ -31,7 +32,7 @@ License:        GPL v2 or later; LGPL v2.1 or later
 Group:          System/X11/Terminals
 Obsoletes:      gnome-core
 Version:        2.25.91
-Release:        1
+Release:        2
 Summary:        The GNOME 2.x Desktop Terminal
 Source:         %{name}-%{version}.tar.bz2
 Url:            http://www.gnome.org
@@ -54,10 +55,6 @@ handy for quick tasks on the command line.
 
 %build
 # autoreconf -f -i
-# needed for gnome-terminal-2.16.1:
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-# FIXME: Build as root modifies system!
-#   gnome-panel-2.16.1: --disable-scrollkeeper does not work properly.
 %configure \
     --disable-schemas-install \
     --disable-scrollkeeper
@@ -65,10 +62,10 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 
 %install
 %makeinstall
-# FIXME: Build as root modifies system!
-#   gnome-panel-2.16.1: --disable-scrollkeeper does not work properly.
+# Some doc translations are not ported to gnome-doc-utils, so we still have to
+# do this. When this won't be needed anymore, we'll be able to remove
+# scrollkeeper from BuildRequires.
 rm -r $RPM_BUILD_ROOT%{_localstatedir}/scrollkeeper
-echo DocPath=gnome-terminal >> $RPM_BUILD_ROOT/%{_datadir}/applications/gnome-terminal.desktop
 %suse_update_desktop_file -G "Command Line Terminal" %name TerminalEmulator
 %find_lang %{name}
 %find_gconf_schemas
@@ -94,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %files lang -f %{name}.lang
 
 %changelog
+* Mon Mar 09 2009 vuntz@novell.com
+- Remove -fno-strict-aliasing from CFLAGS.
+- Do not add DocPath to desktop file: it's not needed by yelp.
 * Tue Feb 17 2009 mboman@suse.de
 - Update to version 2.25.91:
   + Translation updates