diff --git a/keyutils.changes b/keyutils.changes
index d7efdbf..4e87386 100644
--- a/keyutils.changes
+++ b/keyutils.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec 14 16:33:36 CET 2009 - jengelh@medozas.de
+
+- add baselibs.conf as a source
+- enable parallel building
+
 -------------------------------------------------------------------
 Mon Nov 24 12:52:44 CET 2008 - meissner@suse.de
 
diff --git a/keyutils.spec b/keyutils.spec
index e61f97e..582f7b6 100644
--- a/keyutils.spec
+++ b/keyutils.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package keyutils (Version 1.2)
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 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
@@ -20,13 +20,14 @@
 
 Name:           keyutils
 Url:            http://people.redhat.com/~dhowells/keyutils/
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Group:          System/Kernel
 AutoReqProv:    on
 Summary:        Linux Key Management Utilities
 Version:        1.2
-Release:        107
+Release:        108
 Source0:        http://people.redhat.com/~dhowells/keyutils/%name-%version.tar.bz2
+Source1:        baselibs.conf
 Patch0:         keyutils-1.2-strict-aliasing-punning.patch
 Patch1:         request-key-cifs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -43,7 +44,7 @@ Authors:
     David Howells <dhowells@redhat.com>
 
 %package libs
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Summary:        Key utilities library
 Group:          System/Kernel
 
@@ -58,7 +59,7 @@ Authors:
     David Howells <dhowells@redhat.com>
 
 %package devel
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPLv2+ ; LGPLv2.1+
 Summary:        Development package for building linux key management utilities
 Group:          System/Kernel
 Requires:       %{name}-libs = %{version} glibc-devel 
@@ -78,7 +79,7 @@ Authors:
 %patch1
 
 %build
-make NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS"
+make %{?jobs:-j%jobs} NO_ARLIB=1 CFLAGS="$RPM_OPT_FLAGS"
 
 %install
 make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_lib
@@ -108,22 +109,3 @@ make install NO_ARLIB=1 DESTDIR=$RPM_BUILD_ROOT LIBDIR=/%_lib USRLIBDIR=/usr/%_l
 %{_includedir}/*
 
 %changelog
-* Mon Nov 24 2008 meissner@suse.de
-- added 2 cifs helpers to request-key.conf (for CIFS DFS support)
-  bnc#432494, FATE#303758
-* Thu Nov 13 2008 crrodriguez@suse.de
-- build request-key.c with -fno-strict-aliasing to avoid
-  possible breakages
-* Thu Apr 10 2008 ro@suse.de
-- added baselibs.conf file to build xxbit packages
-  for multilib support
-* Thu Dec 14 2006 meissner@suse.de
-- Upgraded to 1.2.
-	- call ldconfig
-	- removed manpages (now in global man-pages)
-* Wed Jul 19 2006 meissner@suse.de
-- Upgraded to 1.1.
-	- cleanups, new manpage.
-- no static lib anymore (like upstream).
-* Fri Apr 21 2006 meissner@suse.de
-- initial import of version 1.0.