diff --git a/pam.changes b/pam.changes
index 6bdf36c..2d8e0ca 100644
--- a/pam.changes
+++ b/pam.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu May 26 09:37:34 UTC 2011 - cfarrell@novell.com
+
+- license update: GPL-2.0+ or BSD-3-Clause
+  Updating to spdx.org/licenses syntax as legal-auto for some reason did
+  not accept the previous spec file license
+
+-------------------------------------------------------------------
+Wed May 25 16:15:30 CEST 2011 - kukuk@suse.de
+
+- Remove libxcrypt-devel from BuildRequires
+
 -------------------------------------------------------------------
 Wed Feb 23 12:45:03 UTC 2011 - vcizek@novell.com
 
diff --git a/pam.spec b/pam.spec
index b22b282..a3972ee 100644
--- a/pam.spec
+++ b/pam.spec
@@ -21,7 +21,7 @@
 
 Name:           pam
 Url:            http://www.kernel.org/pub/linux/libs/pam/
-BuildRequires:  bison cracklib-devel db-devel flex libxcrypt-devel
+BuildRequires:  bison cracklib-devel db-devel flex
 BuildRequires:  audit-devel
 %if %{enable_selinux}
 BuildRequires:  libselinux-devel
@@ -29,7 +29,7 @@ BuildRequires:  libselinux-devel
 %define libpam_so_version 0.83.0
 %define libpam_misc_so_version 0.82.0
 %define libpamc_so_version 0.82.1
-License:        Beerware, Cardware, Shareware (not restricted) ; BSD3c ; GPLv2+
+License:        GPL-2.0+ or BSD-3-Clause
 Group:          System/Libraries
 AutoReqProv:    on
 # bug437293
@@ -63,7 +63,7 @@ having to recompile programs that do authentication.
 
 
 %package doc
-License:        Beerware, Cardware, Shareware (not restricted) ; BSD3c ; GPLv2+
+License:        GPL-2.0+ or BSD-3-Clause
 Summary:        Documentation for Pluggable Authentication Modules
 Group:          Documentation/HTML
 ###BuildArch:      noarch
@@ -78,7 +78,7 @@ This package contains the documentation.
 
 
 %package devel
-License:        Beerware, Cardware, Shareware (not restricted) ; BSD3c ; GPLv2+
+License:        GPL-2.0+ or BSD-3-Clause
 Summary:        Include Files and Libraries for PAM-Development
 Group:          Development/Libraries/C and C++
 Requires:       pam = %{version} glibc-devel