diff --git a/subversion.changes b/subversion.changes
index 3e327b0..5f57b12 100644
--- a/subversion.changes
+++ b/subversion.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan  4 13:12:51 CET 2010 - vuntz@opensuse.org
+
+- Change gnome-keyring-devel BuildRequires to
+  libgnome-keyring-devel on 11.3 and later, following the module
+  split upstream.
+
 -------------------------------------------------------------------
 Thu Oct 22 23:24:20 CEST 2009 - stsp@elego.de
 
diff --git a/subversion.spec b/subversion.spec
index 9e30429..528cae0 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package subversion (Version 1.6.6)
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2009 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -42,7 +42,7 @@
 
 Name:           subversion
 Version:        1.6.6
-Release:        1
+Release:        2
 # in-tree SWIG version to use for the build:
 %define swig_version   1.3.36
 %define sqlite_version 3.6.17
@@ -66,7 +66,12 @@ BuildRequires:  apache2-prefork
 BuildRequires:  cyrus-sasl-devel
 %if %with_gnome_keyring
 BuildRequires:  dbus-1-devel
-BuildRequires:  glib2-devel gnome-keyring-devel
+BuildRequires:  glib2-devel
+%if 0%{?suse_version} >= 1130
+BuildRequires:  libgnome-keyring-devel
+%else
+BuildRequires:  gnome-keyring-devel
+%endif
 %endif # with_gnome_keyring
 %if %with_kde4_kwallet
 BuildRequires:  dbus-1-devel
@@ -178,7 +183,7 @@ client is svn.
 
 
 %package devel
-License:        Apache Software License ..
+License:        ASLv..
 Group:          Development/Libraries/C and C++
 Summary:        Development package for Subversion developers
 Requires:       subversion = %{version}
@@ -192,7 +197,7 @@ files for developers interacting with the subversion package.
 
 
 %package tools
-License:        Apache Software License .. ; Subversion License, http://subversion.tigris.org/license-1.html
+License:        ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html
 Group:          Development/Tools/Version Control
 Summary:        Tools for Subversion
 
@@ -218,7 +223,7 @@ http://subversion.tigris.org/tools_contrib.html
 
 
 %package perl
-License:        Apache Software License .. ; Subversion License, http://subversion.tigris.org/license-1.html
+License:        ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html
 Group:          Development/Tools/Version Control
 Summary:        Allows Perl scripts to directly use Subversion repositories.
 Requires:       subversion = %{version}
@@ -230,7 +235,7 @@ Provides Perl (SWIG) support for Subversion.
 
 
 %package python
-License:        Apache Software License .. ; Subversion License, http://subversion.tigris.org/license-1.html
+License:        ASLv.. ; Subversion License, http://subversion.tigris.org/license-1.html
 Group:          Development/Tools/Version Control
 Summary:        Allows Python scripts to directly use Subversion repositories.
 Requires:       subversion = %{version}
@@ -270,7 +275,7 @@ Provides Ruby (SWIG) support for Subversion.
 %endif # with_ruby
 
 %package server
-License:        Apache Software License ..
+License:        ASLv..
 Group:          Development/Tools/Version Control
 Summary:        Apache server module for Subversion server
 Requires:       subversion = %{version} apache2 %{apache_mmn}