diff --git a/elfutils.changes b/elfutils.changes
index 5729a42..0c5b8e7 100644
--- a/elfutils.changes
+++ b/elfutils.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Dec  2 08:59:33 UTC 2011 - cfarrell@suse.com
+
+- license update: GPL-2.0-with-osi-exception
+  elfutils is GPL-2.0 (only) with an exception for osi approved licenses.
+  Also, use SPDX format
+
+-------------------------------------------------------------------
+Thu Dec  1 11:22:12 UTC 2011 - coolo@suse.com
+
+- add automake as buildrequire to avoid implicit dependency
+
 -------------------------------------------------------------------
 Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
 
diff --git a/elfutils.spec b/elfutils.spec
index a9b81aa..603b042 100644
--- a/elfutils.spec
+++ b/elfutils.spec
@@ -15,12 +15,10 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
-
 Name:           elfutils
-License:        GPLv2 ; GPLv2+ ; LGPLv2.1+
+License:        GPL-2.0-with-osi-exception
 Version:        0.152
-Release:        3
+Release:        0
 Summary:        Higher-level library to access ELF
 Group:          System/Libraries
 Url:            http://elfutils.fedorahosted.org
@@ -35,7 +33,12 @@ Patch5:         elfutils-uninitialized.diff
 Patch6:         elfutils-0.137-dwarf-header-check-fix.diff
 Patch7:         elfutils-0.148-dont-crash.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  bison flex libbz2-devel xz-devel zlib-devel
+BuildRequires:  automake
+BuildRequires:  bison
+BuildRequires:  flex
+BuildRequires:  libbz2-devel
+BuildRequires:  xz-devel
+BuildRequires:  zlib-devel
 
 %description
 This package provides a higher-level library to access ELF files. This
@@ -44,7 +47,6 @@ is a part of elfutils package.
 %package -n libasm1
 Summary:        A collection of utilities and DSOs to handle compiled objects
 Group:          Development/Tools/Other
-License:        GPLv2 ; GPLv2+ ; LGPLv2.1+
 
 %description -n libasm1
 Elfutils is a collection of utilities, including ld (a linker), nm (for
@@ -57,7 +59,7 @@ which implement DWARF, ELF, and machine-specific ELF handling.
 %package -n libasm-devel
 Summary:        A collection of utilities and DSOs to handle compiled objects
 Group:          Development/Tools/Other
-License:        GPLv2+
+License:        GPL-2.0-with-osi-exception
 Requires:       glibc-devel, libasm1 = %{version}
 
 %description -n libasm-devel
@@ -71,7 +73,7 @@ which implement DWARF, ELF, and machine-specific ELF handling.
 %package -n libebl1
 Summary:        A collection of utilities and DSOs to handle compiled objects
 Group:          Development/Tools/Other
-License:        GPLv2+
+License:        GPL-2.0-with-osi-exception
 Provides:       libebl = %{version}
 Obsoletes:      libebl < %{version}
 
@@ -86,7 +88,7 @@ which implement DWARF, ELF, and machine-specific ELF handling.
 %package -n libebl-devel
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
-License:        GPLv2+
+License:        GPL-2.0-with-osi-exception
 Requires:       glibc-devel, libebl1 = %{version}, libdw-devel = %{version}
 
 %description -n libebl-devel
@@ -95,8 +97,7 @@ to develop applications that require these.
 
 %package -n libelf1
 Summary:        Library to read and write ELF files
-Group:          System/Libraries
-License:        GPLv2+
+License:        GPL-2.0-with-osi-exception
 
 %description -n libelf1
 This package provides a high-level library to read and write ELF files.
@@ -105,7 +106,7 @@ This is a part of elfutils package.
 %package -n libelf-devel
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
-License:        GPLv2+
+License:        GPL-2.0-with-osi-exception
 Requires:       glibc-devel, libelf1 = %{version}
 Conflicts:      libelf0-devel
 
@@ -115,8 +116,7 @@ to develop applications that require these.
 
 %package -n libdw1
 Summary:        Library to access DWARF debugging information
-Group:          System/Libraries
-License:        GPLv2+
+License:        GPL-2.0-with-osi-exception
 
 %description -n libdw1
 This package provides a high-level library to access the DWARF debugging
@@ -125,7 +125,7 @@ information.  This is a part of elfutils package.
 %package -n libdw-devel
 Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
-License:        GPLv2+
+License:        GPL-2.0-with-osi-exception
 Requires:       glibc-devel, libdw1 = %{version}
 Requires:       libelf-devel = %{version}