diff --git a/collectd.changes b/collectd.changes
index dfd53e5..2efcfc7 100644
--- a/collectd.changes
+++ b/collectd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 12 11:30:32 UTC 2012 - coolo@suse.com
+
+- change license to be in spdx.org format
+
 -------------------------------------------------------------------
 Mon Oct 17 09:19:25 UTC 2011 - schubi@suse.com
 
diff --git a/collectd.spec b/collectd.spec
index e979813..99ffe12 100644
--- a/collectd.spec
+++ b/collectd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package collectd
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 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
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 %if 0%{?_with_xmms:1}0
 %define xmms 1
 %else
@@ -117,6 +116,8 @@ Name:           collectd
 Version:        4.10.3
 Release:        0
 Summary:        Statistics Collection Daemon for filling RRD Files
+License:        GPL-2.0+
+Group:          System/Monitoring
 Source:         http://collectd.org/files/collectd-%{version}.tar.bz2
 Source1:        collectd.suse.init
 Source2:        collectd.apache2.conf
@@ -149,12 +150,18 @@ Patch26:        collectd-iptc.diff
 Patch27:        collectd-libnotify_070.patch
 Patch28:        collectd-fix_new_yajl_lib.patch
 Url:            http://collectd.org/
-Group:          System/Monitoring
-License:        GNU General Public License (GPL)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       sensors rrdtool
-BuildRequires:  libpng-devel perl rrdtool sensors zlib-devel
-BuildRequires:  bind-devel gettext gettext-devel intltool libstatgrab-devel
+BuildRequires:  bind-devel
+BuildRequires:  gettext
+BuildRequires:  gettext-devel
+BuildRequires:  intltool
+BuildRequires:  libpng-devel
+BuildRequires:  libstatgrab-devel
+BuildRequires:  perl
+BuildRequires:  rrdtool
+BuildRequires:  sensors
+BuildRequires:  zlib-devel
 %if 0%{?suse_version} > 1020
 BuildRequires:  libdb-4_5-devel
 %else
@@ -166,11 +173,18 @@ BuildRequires:  libgcrypt-devel
 BuildRequires:  libgcrypt
 %endif
 BuildRequires:  liboping-devel
-BuildRequires:  autoconf automake gcc libtool make pkgconfig
-BuildRequires:  freetype2-devel libart_lgpl-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  gcc
+BuildRequires:  libtool
+BuildRequires:  make
+BuildRequires:  pkgconfig
+BuildRequires:  freetype2-devel
+BuildRequires:  libart_lgpl-devel
 BuildRequires:  python-devel
 %if %libnotify
-BuildRequires:  gtk2-devel libnotify-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  libnotify-devel
 %endif
 %if %java
 BuildRequires:  java-devel
@@ -201,14 +215,16 @@ BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
 %if %ipmi
 # for ipmi:
-BuildRequires:  OpenIPMI-devel gdbm-devel
+BuildRequires:  OpenIPMI-devel
+BuildRequires:  gdbm-devel
 %endif #ipmi
 %if %snmp
 # for snmp:
 BuildRequires:  net-snmp-devel
 %endif #snmp
 # for ipvs and madwifi:
-BuildRequires:  kernel-source linux-kernel-headers
+BuildRequires:  kernel-source
+BuildRequires:  linux-kernel-headers
 %if %suse_version >= 1030
 BuildRequires:  libpcap-devel
 %endif