diff --git a/audit-secondary.spec b/audit-secondary.spec
index 550a934..769e3af 100644
--- a/audit-secondary.spec
+++ b/audit-secondary.spec
@@ -2,9 +2,16 @@
 # spec file for package audit-secondary (Version 1.7.4)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -19,7 +26,7 @@ Summary:        Python Bindings for libaudit
 License:        GPL v2 or later
 Group:          System/Monitoring
 Version:        1.7.4
-Release:        2
+Release:        3
 Url:            http://people.redhat.com/sgrubb/audit/
 Source0:        audit-%{version}.tar.bz2
 Patch0:         audit-no_sca.patch
diff --git a/audit.changes b/audit.changes
index a113473..830d4db 100644
--- a/audit.changes
+++ b/audit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug  5 03:13:56 CEST 2008 - tonyj@suse.de
+
+- Remove audit rules on audit stop (bnc#409093)
+
 -------------------------------------------------------------------
 Wed Jun 25 01:50:54 CEST 2008 - tonyj@suse.de
 
diff --git a/audit.spec b/audit.spec
index 15f4b6e..18bbd84 100644
--- a/audit.spec
+++ b/audit.spec
@@ -2,9 +2,16 @@
 # spec file for package audit (Version 1.7.4)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -15,7 +22,7 @@ Name:           audit
 BuildRequires:  gcc-c++
 Summary:        User Space Tools for 2.6 Kernel Auditing
 Version:        1.7.4
-Release:        9
+Release:        13
 License:        GPL v2 or later
 Group:          System/Monitoring
 Url:            http://people.redhat.com/sgrubb/audit/
@@ -202,6 +209,8 @@ fi
 %attr(755,root,root) /usr/bin/ausyscall
 
 %changelog
+* Tue Aug 05 2008 tonyj@suse.de
+- Remove audit rules on audit stop (bnc#409093)
 * Wed Jun 25 2008 tonyj@suse.de
 - Update from 1.7.2 to 1.7.4
 - Redhat changelog for 1.7.3 - 1.7.4 follows:
diff --git a/auditd.init b/auditd.init
index 4475a86..4178144 100644
--- a/auditd.init
+++ b/auditd.init
@@ -117,8 +117,14 @@ case "$1" in
 
 	killproc -TERM $AUDITD_BIN
 
-	# Remember status and be verbose
+	# Remember status and be verbose. Failure of following auditctl -D
+	# shouldn't impact status
 	rc_status -v
+
+	# Remove watches so shutdown works cleanly
+	if test "`echo $AUDITD_CLEAN_STOP | tr 'NO' 'no'`" != "no" ; then
+		/sbin/auditctl -D >/dev/null
+	fi
 	;;
     try-restart|condrestart)
 	## Do a restart only if the service was active before.