diff --git a/collectd.spec b/collectd.spec
index 27cccc3..0e7bd47 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,10 +1,20 @@
-# vim: set ts=4 sw=4 et:
+#
+# spec file for package collectd
+#
+# Copyright (c) 2011 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
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
-# TODO:
-# libtokyotyrant (tcrdb.h)
-# libupsclient (.pc)
-# ? oracle ($ORACLE_HOME)
-# gmond
 
 %if 0%{?_with_xmms:1}0
 %define xmms 1
@@ -105,7 +115,7 @@
 
 Name:           collectd
 Version:        4.10.3
-Release:        0
+Release:        1
 Summary:        Statistics Collection Daemon for filling RRD Files
 Source:         http://collectd.org/files/collectd-%{version}.tar.bz2
 Source1:        collectd.suse.init
@@ -137,13 +147,13 @@ Patch25:        collectd-df-remove-duplicates.patch
 Patch26:        collectd-libip4tc.patch
 Patch27:        collectd-libnotify_070.patch
 Source99:       collectd-rpmlintrc
-URL:            http://collectd.org/
+Url:            http://collectd.org/
 Group:          System/Monitoring
 License:        GNU General Public License (GPL)
-BuildRoot:      %{_tmppath}/build-%{name}-%{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       sensors rrdtool
-BuildRequires:  sensors rrdtool libpng-devel zlib-devel perl
-BuildRequires:  libstatgrab-devel gettext gettext-devel intltool bind-devel
+BuildRequires:  libpng-devel perl rrdtool sensors zlib-devel
+BuildRequires:  bind-devel gettext gettext-devel intltool libstatgrab-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  libdb-4_5-devel
 %else
@@ -155,11 +165,11 @@ BuildRequires:  libgcrypt-devel
 BuildRequires:  libgcrypt
 %endif
 BuildRequires:  liboping-devel
-BuildRequires:  make gcc autoconf automake libtool pkgconfig
+BuildRequires:  autoconf automake gcc libtool make pkgconfig
 BuildRequires:  freetype2-devel libart_lgpl-devel
 BuildRequires:  python-devel
 %if %libnotify
-BuildRequires:  libnotify-devel gtk2-devel
+BuildRequires:  gtk2-devel libnotify-devel
 %endif
 %if %java
 BuildRequires:  java-devel
@@ -197,7 +207,7 @@ BuildRequires:  OpenIPMI-devel gdbm-devel
 BuildRequires:  net-snmp-devel
 %endif #snmp
 # for ipvs and madwifi:
-BuildRequires:  linux-kernel-headers kernel-source
+BuildRequires:  kernel-source linux-kernel-headers
 %if %suse_version >= 1030
 BuildRequires:  libpcap-devel
 %endif
@@ -245,6 +255,7 @@ Authors:
     Florian octo Forster <octo@verplant.org>
 
 %package web
+
 Summary:        Web Frontend for watching the %{name} Statistics
 Group:          System/Monitoring
 Requires:       perl apache2 rrdtool
@@ -260,6 +271,7 @@ Web frontend CGI for watching %{name} statistics from a browser.
 Please look at /etc/apache2/conf.d/%{name}.conf on how to enable.
 
 %package web-js
+
 Summary:        Web/JavaScript Frontend for watching %{name} Statistics
 Group:          System/Monitoring
 Requires:       perl apache2 rrdtool
@@ -278,7 +290,9 @@ Please look at /etc/apache2/conf.d/%{name}-js.conf on how to
 enable.
 
 %if %libnotify
+
 %package plugin-notify-desktop
+
 Summary:        Desktop Notification Plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -288,7 +302,9 @@ Desktop Notification Support for %{name}
 %endif #libnotify
 
 %if %ipmi
+
 %package plugin-ipmi
+
 Summary:        OpenIPMI Monitoring Plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -299,7 +315,9 @@ library, for IPMI enabled systems.
 %endif #ipmi
 
 %if %snmp
+
 %package plugin-snmp
+
 Summary:        SNMP Monitoring Plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -312,7 +330,9 @@ Optional %{name} plugin to monitor devices using SNMP.
 %endif #snmp
 
 %if %with_mysql
+
 %package plugin-mysql
+
 Summary:        MySQL Monitoring Plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -322,7 +342,9 @@ Optional %{name} plugin to monitor MySQL server instances.
 %endif #with_mysql
 
 %if %with_pgsql
+
 %package plugin-postgresql
+
 Summary:        PostgreSQL Monitoring Plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -332,6 +354,7 @@ Optional %{name} plugin to monitor PostgreSQL server instances.
 %endif #with_pgsql
 
 %package plugin-python
+
 Summary:        Python API for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -341,7 +364,9 @@ Optional %{name} Python API in order to write %{name} plugins in
 Python.
 
 %if %java
+
 %package plugin-java
+
 Summary:        Java API for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -352,7 +377,9 @@ Java.
 %endif #java
 
 %if %virt
+
 %package plugin-virt
+
 Summary:        Virtual Machine Statistics Plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -363,7 +390,9 @@ machines using libvirt.
 %endif
 
 %if %xmms
+
 %package plugin-xmms
+
 Summary:        XMMS Monitoring Plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -374,7 +403,9 @@ bitrates of files played with XMMS.
 %endif #xmms
 
 %if %dbi
+
 %package plugin-dbi
+
 Summary:        DBI Storage Plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -385,7 +416,9 @@ various databases as supported by libdbi.
 %endif #dbi
 
 %if %memcachec
+
 %package plugin-memcachec
+
 Summary:        Memcache Daemon Monitoring Plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -395,7 +428,9 @@ Optional %{name} plugin to sample memcached statistics.
 %endif #memcachec
 
 %if %protobuf
+
 %package plugin-pinba
+
 Summary:        Pinba Collector Plugin for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -406,6 +441,7 @@ profiling extension for PHP.
 %endif #protobuf
 
 %package plugins-all
+
 Summary:        All Monitoring Plugins for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -448,6 +484,7 @@ Metapackage that installs %{name} and all the available
 monitoring plugin subpackages, except %{name}-plugin-xmms
 
 %package spamassassin
+
 Summary:        Spamassassin Monitoring for %{name}
 Group:          System/Monitoring
 Requires:       %{name} = %{version}-%{release}
@@ -458,6 +495,7 @@ Plugin for filling %{name} with statistics from the
 SpamAsssassin anti-spam engine.
 
 %package -n libcollectdclient0
+
 Summary:        Library for %{name} clients
 Group:          System/Monitoring
 Provides:       libcollectdclient = %{version}-%{release}
@@ -467,6 +505,7 @@ Library which abstracts communication with the %{name}
 unixsock plugin for clients.
 
 %package -n libcollectdclient-devel
+
 Summary:        Development Environment for %{name} clients
 Group:          Development/Libraries/C and C++
 Requires:       libcollectdclient0 = %{version}-%{release}
@@ -744,6 +783,7 @@ EOF
 %{fillup_only collectd}
 
 %post   -n libcollectdclient0 -p /sbin/ldconfig
+
 %postun -n libcollectdclient0 -p /sbin/ldconfig
 
 %clean
@@ -802,6 +842,7 @@ EOF
 %{_usr}/lib/collectd-js
 
 %if %libnotify
+
 %files plugin-notify-desktop
 %defattr(-,root,root)
 %{_libdir}/collectd/notify_desktop.so
@@ -809,6 +850,7 @@ EOF
 %endif #libnotify
 
 %if %ipmi
+
 %files plugin-ipmi
 %defattr(-,root,root)
 %{_libdir}/collectd/ipmi.so
@@ -816,6 +858,7 @@ EOF
 %endif #ipmi
 
 %if %snmp
+
 %files plugin-snmp
 %defattr(-,root,root)
 %doc _rpmdoc_/snmp/*
@@ -829,6 +872,7 @@ EOF
 %endif #snmp
 
 %if %protobuf
+
 %files plugin-pinba
 %defattr(-,root,root)
 %{_libdir}/collectd/pinba.so
@@ -836,6 +880,7 @@ EOF
 %endif #protobuf
 
 %if %suse_version >= 930
+
 %files plugin-mysql
 %defattr(-,root,root)
 %{_libdir}/collectd/mysql.so
@@ -843,6 +888,7 @@ EOF
 %endif
 
 %if %with_pgsql
+
 %files plugin-postgresql
 %defattr(-,root,root)
 %{_libdir}/collectd/postgresql.so
@@ -857,6 +903,7 @@ EOF
 %doc %{_mandir}/man5/collectd-python.5%{ext_man}
 
 %if %java
+
 %files plugin-java
 %defattr(-,root,root)
 %doc _rpmdoc_/java/GenericJMX.conf
@@ -867,6 +914,7 @@ EOF
 %endif #java
 
 %if %virt
+
 %files plugin-virt
 %defattr(-,root,root)
 %{_libdir}/collectd/libvirt.so
@@ -874,6 +922,7 @@ EOF
 %endif #virt
 
 %if %xmms
+
 %files plugin-xmms
 %defattr(-,root,root)
 %{_libdir}/collectd/xmms.so
@@ -881,6 +930,7 @@ EOF
 %endif #xmms
 
 %if %dbi
+
 %files plugin-dbi
 %defattr(-,root,root)
 %{_libdir}/collectd/dbi.so
@@ -888,6 +938,7 @@ EOF
 %endif #dbi
 
 %if %memcachec
+
 %files plugin-memcachec
 %defattr(-,root,root)
 %{_libdir}/collectd/memcachec.so