diff --git a/libdbi.changes b/libdbi.changes
index c4f7f6c..9149d25 100644
--- a/libdbi.changes
+++ b/libdbi.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Dec 13 13:32:14 UTC 2011 - idonmez@suse.com
+
+- Optimization level 20 doesn't really exist, fix it to -O3 
+- Fix license to be LGPL-2.1+
+
 -------------------------------------------------------------------
 Fri Sep 16 17:28:14 UTC 2011 - jengelh@medozas.de
 
diff --git a/libdbi.spec b/libdbi.spec
index 4276636..a1eb5b7 100644
--- a/libdbi.spec
+++ b/libdbi.spec
@@ -23,8 +23,8 @@ Summary:        Database Independent Abstraction Layer for C
 Name:           libdbi
 Version:        0.8.3
 Release:        1
-Group:          Development/Libraries
-License:        LGPL
+Group:          Development/Libraries/C and C++
+License:        LGPL-2.1+
 Url:            http://libdbi.sourceforge.net/
 Source:         %{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
@@ -40,7 +40,7 @@ connections by using this framework.
 
 %package -n %{lname}
 
-Group:          Development/Libraries
+Group:          Development/Libraries/C and C++
 Summary:        Database Independent Abstraction Layer for C
 
 %description -n %{lname}
@@ -52,7 +52,7 @@ connections by using this framework.
 %package devel
 
 Summary:        Development files for libdbi (Database Independent Abstraction Layer for C)
-Group:          Development/Libraries
+Group:          Development/Libraries/C and C++
 Requires:       %{lname} = %{version}
 
 %description devel
@@ -61,6 +61,7 @@ needed to develop applications with libdbi.
 
 %prep
 %setup -q
+sed -i s,\-O20,\-O3,g configure
 
 %build
 %configure --disable-docs --disable-static