diff --git a/.cvsignore b/.cvsignore
index fa981ab..07cce13 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -14,3 +14,4 @@ policycoreutils-1.21.7.tgz
 policycoreutils-1.21.9.tgz
 policycoreutils-1.21.10.tgz
 policycoreutils-1.21.12.tgz
+policycoreutils-1.21.13.tgz
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index 912c4d5..3c378f5 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,65 +1,22 @@
-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.12/scripts/fixfiles	2005-02-02 17:23:48.000000000 -0500
-@@ -67,8 +67,8 @@
-                -e 's|\?.*|*|g' \
- 	       -e 's|\(.*|*|g' \
- 	       -e 's|\[.*|*|g' \
--               -e 's|\.\*|*|g' \
--               -e 's|\.\+|*|g' | \
-+               -e 's|\.\*.*|*|g' \
-+               -e 's|\.\+.*|*|g' | \
- 	sort -d -u | \
-         while read pattern ; \
- 	    do if ! echo "$pattern" | grep -q -f ${TEMPFILE} 2>/dev/null; then \
-@@ -79,7 +79,7 @@
-                fi; \
-             done | \
- 	while read pattern ; do find $pattern -maxdepth 0 -print; done 2> /dev/null | \
--	${RESTORECON} -R $2 -v -e /root -e /home -e /tmp -e /var/tmp -e /dev -f - 
-+	 ${RESTORECON} -R $2 -v -e /root -e /home -e /tmp -e /var/tmp -e /dev -f - 
- 	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 --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.21.13/restorecon/restorecon.c
+--- nsapolicycoreutils/restorecon/restorecon.c	2005-02-02 17:20:59.000000000 -0500
++++ policycoreutils-1.21.13/restorecon/restorecon.c	2005-02-08 13:32:22.000000000 -0500
+@@ -118,8 +118,8 @@
+ int restore(char *filename) {
+   int retcontext=0;
+   int retval=0;
+-  security_context_t scontext;
+-  security_context_t prev_context;
++  security_context_t scontext=NULL;
++  security_context_t prev_context=NULL;
+   int len=strlen(filename);
+   struct stat st;
+   char path[PATH_MAX+1];
+@@ -185,6 +185,7 @@
+   
+   if (retcontext >= 0 || errno == ENODATA) {
+     int customizable=0;
++    if (retcontext < 0) prev_context=NULL;
+     if (retcontext < 0 || 
+ 	(strcmp(prev_context,scontext) != 0 && 	
+ 	 !(customizable=(force ? 0: (is_context_customizable(prev_context) > 0))))) {
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 06cd8e4..14723cc 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,8 +1,8 @@
 %define libselinuxver 1.21.5
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.21.12
-Release: 2
+Version: 1.21.13
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -81,6 +81,13 @@ rm -rf ${RPM_BUILD_ROOT}
 %config(noreplace) %{_sysconfdir}/sestatus.conf
 
 %changelog
+* Tue Feb 8 2005 Dan Walsh <dwalsh@redhat.com> 1.21.13-1
+- Update from NSA
+	* Merged further change to fixfiles -C from Dan Walsh.
+	* Merged updated fixfiles script from Dan Walsh.
+- Fix error handling of restorecon
+
+
 * Mon Feb 7 2005 Dan Walsh <dwalsh@redhat.com> 1.21.12-2
 - Fix sestatus for longer booleans
 
diff --git a/sources b/sources
index 860359e..c9dc592 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-648054135b8fa75f0ed537408134aba2  policycoreutils-1.21.12.tgz
+48c84520107ef23326bba9dcdfc505de  policycoreutils-1.21.13.tgz