diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow policycoreutils-1.30.4/audit2allow/audit2allow
--- nsapolicycoreutils/audit2allow/audit2allow	2006-03-29 15:35:22.000000000 -0500
+++ policycoreutils-1.30.4/audit2allow/audit2allow	2006-04-05 08:59:26.000000000 -0400
@@ -577,7 +577,7 @@
 		if ref_ind:
 			out.gen_reference_policy()
 
-		if auditlogs:
+		if auditlogs and os.path.exists("/var/log/audit/audit.log"):
 			input=os.popen("ausearch -m avc")
 			out.load(input)
 
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/audit2allow/audit2allow.1 policycoreutils-1.30.4/audit2allow/audit2allow.1
--- nsapolicycoreutils/audit2allow/audit2allow.1	2006-03-10 09:48:04.000000000 -0500
+++ policycoreutils-1.30.4/audit2allow/audit2allow.1	2006-04-05 09:09:05.000000000 -0400
@@ -98,6 +98,11 @@
 .PP
 .SH EXAMPLE
 .nf
+.B NOTE: These examples are for systems using the audit package.  If you do 
+.B not use the audit package,  the AVC messages will be in /var/log/messages.
+.B Please substiture /var/log/messages for /var/log/audit/audit.log in the 
+.B examples.
+.PP
 .B Using audit2allow to generate monolithic (non-module) policy
 $ cd /etc/selinux/$SELINUXTYPE/src/policy
 $ cat /var/log/audit/audit.log | audit2allow >> domains/misc/local.te
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.conf policycoreutils-1.30.4/restorecond/restorecond.conf
--- nsapolicycoreutils/restorecond/restorecond.conf	2006-03-29 11:08:21.000000000 -0500
+++ policycoreutils-1.30.4/restorecond/restorecond.conf	2006-04-03 11:57:26.000000000 -0400
@@ -2,3 +2,4 @@
 /etc/mtab
 /var/run/utmp
 ~/public_html
+~/.mozilla/plugins/libflashplayer.so
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/semanage policycoreutils-1.30.4/semanage/semanage
--- nsapolicycoreutils/semanage/semanage	2006-03-29 15:35:22.000000000 -0500
+++ policycoreutils-1.30.4/semanage/semanage	2006-04-01 04:54:36.000000000 -0500
@@ -286,6 +286,8 @@
 		errorExit("Options Error " + error.msg)
 	except ValueError, error:
 		errorExit(error.args[0])
+	except KeyError, error:
+		errorExit("Invalid value %s" % error.args[0])
 	except IOError, error:
 		errorExit(error.args[1])
 	except KeyboardInterrupt, error: