diff --git a/adolc.changes b/adolc.changes
index ec47319..7840ec8 100644
--- a/adolc.changes
+++ b/adolc.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Fri Feb 17 06:44:42 UTC 2012 - kkhere.geo@gmail.com
+
+- Change License tag to reflect discussion in bnc#739158 
+
+-------------------------------------------------------------------
+Mon Dec 19 11:13:36 UTC 2011 - Rene.vanPaassen@gmail.com
+
+- Corrected group tags to proper categories 
+
+-------------------------------------------------------------------
+Fri Dec 16 16:19:31 UTC 2011 - Rene.vanPaassen@gmail.com
+
+- need Group: tags for SLE_11 and SLE_11_SP1, if all tags are equal, 
+  the format_spec_file service is so NICE (not!) to remove subpackage
+  group tags. the doc package needs a Group: Documentation tag 
+  (guidelines), and then, fortunately, format_spec_file leaves
+  us alone 
+
+-------------------------------------------------------------------
+Thu Dec 15 10:28:47 UTC 2011 - coolo@suse.com
+
+- fix license to be in spdx.org format
+
 -------------------------------------------------------------------
 Thu Oct  6 10:59:00 UTC 2011 - kkhere.geo@gmail.com
 
diff --git a/adolc.spec b/adolc.spec
index 9c6fab3..36eee15 100644
--- a/adolc.spec
+++ b/adolc.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package adolc
 #
-# 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
@@ -21,17 +21,21 @@
 Name:           adolc
 %define lname	libadolc1
 Version:        2.2.1
-Release:        1
-License:        GPLv2 or CPL
+Release:        0
 Summary:        Algorithmic Differentiation Library for C/C++
+License:        (GPL-2.0 or CPL-1.0) and LGPL-3.0
+Group:          Development/Libraries/C and C++
+# see bnc#739158 for a discussion on the licensing issue
 Url:            http://projects.coin-or.org/ADOL-C
-Group:          Development/Languages/C and C++
 Source:         %{name}-%{packver}.tar.bz2
 Source1:        ColPack-1.0.4.tar.bz2
 Source2:        baselibs.conf
 Patch1:         correct-no-return-in-non-void.patch
-BuildRequires:  autoconf automake libtool
-BuildRequires:  gcc-c++ libstdc++-devel
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  gcc-c++
+BuildRequires:  libstdc++-devel
+BuildRequires:  libtool
 # BuildRequires:  texlive texlive-latex
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -47,9 +51,8 @@ truncation errors at a small multiple of the run time and randomly
 accessed memory of the given function evaluation program.
 
 %package -n %lname
-License:        GPLv2 or CPL
 Summary:        Algorithmic Differentiation Library for C/C++
-Group:          Development/Languages/C and C++
+Group:          System/Libraries
 
 %description -n %lname
 The package ADOL-C (Automatic Differentiation by OverLoading in C++)
@@ -63,9 +66,8 @@ truncation errors at a small multiple of the run time and randomly
 accessed memory of the given function evaluation program.
 
 %package devel
-License:        GPLv2 or CPL
 Summary:        Algorithmic Differentiation Library for C/C++ -- development files
-Group:          Development/Languages/C and C++
+Group:          Development/Libraries/C and C++
 Requires:       %lname = %{version}
 
 %description devel
@@ -82,9 +84,8 @@ accessed memory of the given function evaluation program.
 This package provides the development environment for adolc
 
 %package doc
-License:        GPLv2 or CPL
 Summary:        Algorithmic Differentiation Library for C/C++ -- documentation
-Group:          Development/Languages/C and C++
+Group:          Documentation/Other
 %if 0%{?suse_version} && %{suse_version} >= 1120
 BuildArch:      noarch
 %endif