diff --git a/gtkmm2.changes b/gtkmm2.changes
index 727b734..1f9f7b8 100644
--- a/gtkmm2.changes
+++ b/gtkmm2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Nov 16 12:25:33 UTC 2009 - aj@suse.de
+
+- Mark doc subpackage as noarch.
+
 -------------------------------------------------------------------
 Sun Oct  4 12:32:54 CEST 2009 - vuntz@opensuse.org
 
diff --git a/gtkmm2.spec b/gtkmm2.spec
index dfb1e97..055d092 100644
--- a/gtkmm2.spec
+++ b/gtkmm2.spec
@@ -23,9 +23,9 @@ Name:           gtkmm2
 BuildRequires:  cairomm-devel fdupes gcc-c++ glibmm2-devel libsigc++2-devel pangomm-devel update-desktop-files
 BuildRequires:  gtk2-devel >= 2.15.1
 Version:        2.18.2
-Release:        1
+Release:        2
 Group:          System/Libraries
-License:        GPL v2 or later ; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Summary:        C++ Interface for GTK2 (a GUI Library for X)
 Url:            http://www.gtkmm.org/
 Source:         ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.10/%{_name}-%{version}.tar.bz2
@@ -40,7 +40,7 @@ inheritance, and a comprehensive set of widget classes that can be
 freely combined to quickly create complex user interfaces.
 
 %package devel
-License:        LGPL v2.1 or later
+License:        LGPLv2.1+
 Group:          Development/Libraries/C and C++
 Summary:        C++ Interface for GTK2 (a GUI library for X)
 Requires:       %{name} = %{version} gtk2-devel glibmm2-devel cairomm-devel atk-devel pango-devel pangomm-devel
@@ -54,10 +54,13 @@ inheritance and a comprehensive set of widget classes that can be
 freely combined to quickly create complex user interfaces.
 
 %package doc
-License:        GPL v2 or later ; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Group:          Documentation/HTML
 Summary:        C++ Interface for GTK2 (a GUI Library for X)
 Requires:       glibmm2-doc
+%if %suse_version > 1120
+BuildArch:      noarch
+%endif
 
 %description doc
 Gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps