diff --git a/nut.spec b/nut.spec
index 31498a5..20fe53a 100644
--- a/nut.spec
+++ b/nut.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package nut (Version 2.6.0)
+# spec file for package nut
 #
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# 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
@@ -23,7 +23,7 @@ BuildRequires:  apache2-devel dbus-1-devel gd-devel hal-devel libneon-devel libo
 BuildRequires:  pm-utils
 # To fix end-of-line encoding:
 BuildRequires:  dos2unix
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Hardware/UPS
 Summary:        Network UPS Tools Core (Unbreakable Power Supply Monitoring)
 Version:        2.6.0
@@ -78,7 +78,7 @@ Detailed information about supported hardware can be found in
 /usr/share/doc/packages/nut.
 
 %package drivers-net
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Network UPS Tools - Extra Networking Drivers (for Network Monitoring)
 Group:          Hardware/UPS
 Requires:       %{name}-classic = %{version}
@@ -97,7 +97,7 @@ Detailed information about supported hardware can be found in
 /usr/share/doc/packages/nut.
 
 %package -n libupsclient1
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Network UPS Tools Library (Unbreakable Power Supply Monitoring)
 Group:          System/Libraries
 
@@ -111,7 +111,7 @@ Detailed information about supported hardware can be found in
 /usr/share/doc/packages/nut.
 
 %package classic
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Network UPS Tools Classic Package (Monitoring Server)
 Group:          Hardware/UPS
 Requires:       %{name} = %{version}
@@ -155,7 +155,7 @@ Detailed information about supported hardware can be found in
 /usr/share/doc/packages/nut.
 
 %package hal
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Network UPS Tools Support for HAL (HAL/D-BUS Integration)
 Group:          Hardware/UPS
 Requires:       %{name} = %{version}
@@ -183,7 +183,7 @@ Detailed information about supported hardware can be found in
 /usr/share/doc/packages/nut.
 
 %package cgi
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Network UPS Tools Web Server Support (UPS Status Pages)
 Group:          Hardware/UPS
 Requires:       %{name}-classic = %{version}
@@ -204,7 +204,7 @@ Detailed information about supported hardware can be found in
 /usr/share/doc/packages/nut.
 
 %package devel
-License:        GPL v2 or later
+License:        GPLv2+
 Summary:        Network UPS Tools (Unbreakable Power Supply Monitoring)
 Group:          Development/Libraries/C and C++
 Requires:       %{name} = %{version} openssl-devel