diff --git a/perl-Date-Calc.spec b/perl-Date-Calc.spec
index e0a4847..00f15c1 100644
--- a/perl-Date-Calc.spec
+++ b/perl-Date-Calc.spec
@@ -1,10 +1,10 @@
 Name:           perl-Date-Calc
 Version:        5.4
-Release: 	1.2.2.1
+Release: 	2
 Summary:        A module for extended and efficient date calculations in Perl
 
 Group:          Development/Libraries
-License:        GPL or Artistic
+License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/Date-Calc/
 Source0:  http://www.cpan.org/authors/id/S/ST/STBEY/Date-Calc-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,8 +25,8 @@ thereby complying with all relevant norms and standards: ISO/R
 %{__perl} -pi -e 's|^#!perl\b|#!%{__perl}|' examples/*.{pl,cgi} tools/*.pl
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -40,7 +40,7 @@ file=$RPM_BUILD_ROOT%{_mandir}/man3/Date::Calc.3pm
 iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_"
 mv -f "${file}_" "$file"
 
-%check || :
+%check
 make test
 
 %clean
@@ -57,7 +57,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control
+* Mon Aug 27 2007 Robin Norwood <rnorwood@redhat.com> - 5.4-2
+- Update License tag
+- Clean up minor specfile issues
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 5.4-1.2.2.1
 - rebuild
 
 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 5.4-1.2.2