diff --git a/libconfig.changes b/libconfig.changes
index 69a393c..a2a7353 100644
--- a/libconfig.changes
+++ b/libconfig.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Oct  5 22:19:54 UTC 2014 - jengelh@inai.de
+
+- Make doc subpackage noarch; improve on RPM group classification
+
 -------------------------------------------------------------------
 Sat Dec 29 15:50:18 UTC 2012 - p.drouand@gmail.com
 
diff --git a/libconfig.spec b/libconfig.spec
index d5e4643..4bbda12 100644
--- a/libconfig.spec
+++ b/libconfig.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libconfig
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,6 @@
 #
 
 
-#
 %define docbuild 0
 
 Name:           libconfig
@@ -25,8 +24,9 @@ Release:        0
 %define _soversion 9
 Summary:        A simple library for manipulating structured configuration files
 License:        LGPL-2.1+
-Group:          System/Libraries
+Group:          Development/Libraries/C and C++
 Url:            http://www.hyperrealm.com/main.php?s=libconfig
+
 Source0:        http://www.hyperrealm.com/libconfig/libconfig-%{version}.tar.gz
 Source1:        baselibs.conf
 BuildRequires:  bison
@@ -101,7 +101,6 @@ application code.
 This package contains the shared libraries for libconfig.
 
 %package -n libconfig++-devel
-
 Summary:        C++-Bindings development files for libconfig
 Group:          Development/Languages/C and C++
 Requires:       libconfig++%{_soversion} = %{version}
@@ -121,6 +120,9 @@ This package contains the C++-bindings development files.
 %package doc
 Summary:        Documentation files for libconfig
 Group:          Documentation/Other
+%if 0%{?suse_version} >= 1130
+BuildArch:      noarch
+%endif
 
 %description doc
 Documentation files for package libconfig.
@@ -142,7 +144,7 @@ make pdf
 # clean up
 pushd examples
     make clean
-    find . -name '*.vcproj' -o -name '.deps' |xargs rm -r
+    find . -name '*.vcproj' -o -name '.deps' -exec rm -Rf '{}' '+'
 popd
 rm %{buildroot}%{_libdir}/*.{l,}a
 %fdupes -s examples %{buildroot}%{_docdir}