diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index fe14c6d..912c4d5 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,6 +1,6 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.21.10/scripts/fixfiles
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.21.12/scripts/fixfiles
 --- nsapolicycoreutils/scripts/fixfiles	2005-02-02 17:20:59.000000000 -0500
-+++ policycoreutils-1.21.10/scripts/fixfiles	2005-02-02 13:37:23.000000000 -0500
++++ policycoreutils-1.21.12/scripts/fixfiles	2005-02-02 17:23:48.000000000 -0500
 @@ -67,8 +67,8 @@
                 -e 's|\?.*|*|g' \
  	       -e 's|\(.*|*|g' \
@@ -21,3 +21,45 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policyc
  	rm -f ${TEMPFILE}
  fi
  }
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/sestatus/sestatus.c policycoreutils-1.21.12/sestatus/sestatus.c
+--- nsapolicycoreutils/sestatus/sestatus.c	2004-11-03 15:29:44.000000000 -0500
++++ policycoreutils-1.21.12/sestatus/sestatus.c	2005-02-07 13:55:06.000000000 -0500
+@@ -30,7 +30,7 @@
+ #define BUFSIZE 255
+ 
+ /* column to put the output (must be a multiple of 8) */
+-#define COL 32
++static int COL=32;
+ 
+ extern char *selinux_mnt;
+ 
+@@ -152,15 +152,10 @@
+ }
+ 
+ void printf_tab(const char *outp) {
+-	/* print then add appropriate number of tabs */
+-	int i, count;
++  char buf[20];
++  snprintf(buf, sizeof(buf), "%%-%ds", COL);
++	printf(buf, outp);
+ 
+-	printf("%s",outp);
+-
+-	/* insert the right number of tabs */
+-	count=((COL - strlen(outp) -1) / 8);
+-	for( i=0 ; i<count ; i++ )
+-		printf("\t");
+ }
+ 
+ int main(int argc, char **argv) {
+@@ -276,6 +271,10 @@
+ 		printf("\nPolicy booleans:\n");
+ 
+ 		for( i=0 ; i<nbool ; i++ ) {
++			if (strlen(bools[i]) + 1 > COL) 
++			    COL=strlen(bools[i])+1;
++		}
++		for( i=0 ; i<nbool ; i++ ) {
+ 			printf_tab(bools[i]);
+ 
+ 			rc=security_get_boolean_active(bools[i]);
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 0089ab4..06cd8e4 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -2,7 +2,7 @@
 Summary: SELinux policy core utilities.
 Name: policycoreutils
 Version: 1.21.12
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -81,6 +81,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Mon Feb 7 2005 Dan Walsh <dwalsh@redhat.com> 1.21.12-2
+- Fix sestatus for longer booleans
+
 * Wed Feb 2 2005 Dan Walsh <dwalsh@redhat.com> 1.21.12-1
 - More cleanup of fixfiles sed patch
 	* Merged further patches for restorecon/setfiles -e and fixfiles -C.