diff --git a/aaa_base-chkconfig-help.patch b/aaa_base-chkconfig-help.patch
deleted file mode 100644
index 57d84be..0000000
--- a/aaa_base-chkconfig-help.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Index: aaa_base/sbin/chkconfig
-===================================================================
---- aaa_base.orig/sbin/chkconfig
-+++ aaa_base/sbin/chkconfig
-@@ -489,6 +489,7 @@ sub addmode {
- sub usage {
-   print <<EOF;
- usage:
-+        chkconfig -A|--allservices              (together with -l: show all services)
-         chkconfig -t|--terse [names]            (shows the links)
-         chkconfig -e|--edit  [names]            (configure services)
-         chkconfig -s|--set   [name state]...    (configure services)
-Index: aaa_base/usr/share/man/man8/chkconfig.8
-===================================================================
---- aaa_base.orig/usr/share/man/man8/chkconfig.8
-+++ aaa_base/usr/share/man/man8/chkconfig.8
-@@ -34,6 +34,9 @@ chkconfig \- enable or disable system se
- .RI [ names ]
- .br
- .B chkconfig
-+.B -A|--allservices
-+.br
-+.B chkconfig
- .B -a|--add
- .RI [ names ]
- .br
-@@ -68,7 +71,11 @@ are used. Inetd/xinetd services are conf
- .I /etc/inetd.d
- and
- .IR /etc/xinetd.d ,
--respectively.
-+respectively. You can use the 
-+.B -A
-+or
-+.B --allservices
-+parameter to get all services (even the boot.*-services) listed.
- .PP
- If chkconfig is called without arguments, all services are listed
- in terse mode.
-@@ -121,7 +128,13 @@ terminal. If the
- .B --deps
- option is given, the names of the services that must be started
- before this service is appended to each line. The inetd/xinetd
--services are listed in extra sections.
-+services are listed in extra sections. 
-+
-+You can use the
-+.B -A
-+or
-+.B --allservices
-+parameter to get all services (even the boot.*-services) listed.
- .SH ADD MODE
- Calls insserv
- to enable a service and uses list mode to display the new
diff --git a/aaa_base-lsb-keywords-patch b/aaa_base-lsb-keywords-patch
deleted file mode 100644
index 78463a1..0000000
--- a/aaa_base-lsb-keywords-patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: aaa_base/etc/init.d/boot.cleanup
-===================================================================
---- aaa_base.orig/etc/init.d/boot.cleanup
-+++ aaa_base/etc/init.d/boot.cleanup
-@@ -13,6 +13,9 @@
- # Default-Start:     B
- # Default-Stop:
- # Short-Description: do cleanup
-+# Description: Cleanup left over tempfiles from 
-+#	last run: screen sockets, temporary rpm-database files,
-+#	ssh agent infos, various lockfiles, utmp and some more.
- ### END INIT INFO
- 
- . /etc/rc.status
-Index: aaa_base/etc/init.d/boot.ipconfig
-===================================================================
---- aaa_base.orig/etc/init.d/boot.ipconfig
-+++ aaa_base/etc/init.d/boot.ipconfig
-@@ -13,6 +13,8 @@
- # Default-Start:     B
- # Default-Stop:
- # Short-Description: run ip configuration hooks
-+# Description: Set IP configuration hooks depending on 
-+#	values entered in /etc/sysconfig/sysctl
- ### END INIT INFO
- 
- . /etc/rc.status
-Index: aaa_base/etc/init.d/random
-===================================================================
---- aaa_base.orig/etc/init.d/random
-+++ aaa_base/etc/init.d/random
-@@ -20,6 +20,7 @@
- # Required-Stop:
- # Default-Start:  2 3 5
- # Default-Stop:
-+# Short-Description: Snapshot random state
- # Description:    Script to snapshot random state and reload it at boot time.
- ### END INIT INFO
- 
diff --git a/aaa_base.changes b/aaa_base.changes
index f9daa49..8682cba 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed May  7 15:47:20 CEST 2008 - werner@suse.de
+
+- Add both patches (aaa_base-chkconfig-help.patch and
+  aaa_base-lsb-keywords-patch) to source tree
+- Add kexec call in halt script if a kernel is loaded (bnc#387601)
+
 -------------------------------------------------------------------
 Tue May  6 13:13:25 CEST 2008 - lrupp@suse.de
 
diff --git a/aaa_base.spec b/aaa_base.spec
index 7ec5d01..6e37c20 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -21,7 +21,7 @@ Recommends:     cron logrotate
 PreReq:         /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv net-tools
 AutoReqProv:    on
 Version:        11.0
-Release:        60
+Release:        61
 Summary:        SUSE Linux Base Package
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         aaa_base.tar.bz2
@@ -32,8 +32,6 @@ Source8:        get_kernel_version.c
 Source20:       aaa_base-rpmlintrc
 Source21:       aaa_base.pre
 Source22:       aaa_base.post
-Patch1:         aaa_base-chkconfig-help.patch
-Patch2:         aaa_base-lsb-keywords-patch
 # %ifarch x86_64
 # Obsoletes:      tpctl <= 4.17
 # %endif
@@ -147,6 +145,10 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
 %defattr(-,root,root)
 
 %changelog
+* Wed May 07 2008 werner@suse.de
+- Add both patches (aaa_base-chkconfig-help.patch and
+  aaa_base-lsb-keywords-patch) to source tree
+- Add kexec call in halt script if a kernel is loaded (bnc#387601)
 * Tue May 06 2008 lrupp@suse.de
 - added help for 'chkconfig -A' option (bnc#371548)
   (aa_base-chkconfig-help.patch)
diff --git a/aaa_base.tar.bz2 b/aaa_base.tar.bz2
index 082c061..9e5afae 100644
--- a/aaa_base.tar.bz2
+++ b/aaa_base.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f7e0f66de52c45934536470f3e3cf14c8f7bb3e638f96a00a77bac96e73cbe21
-size 78124
+oid sha256:08e9260c6ae8611dedcb9821459ddd99bcf3aa272c4093d1ead6845271ecf76d
+size 78398