diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.21.20/restorecon/restorecon.c
--- nsapolicycoreutils/restorecon/restorecon.c	2005-02-22 16:37:17.000000000 -0500
+++ policycoreutils-1.21.20/restorecon/restorecon.c	2005-02-28 17:13:13.000000000 -0500
@@ -191,9 +191,9 @@
   if (retcontext >= 0 || errno == ENODATA) {
     int customizable=0;
     if (retcontext < 0) prev_context=NULL;
-    if (retcontext < 0 || 
+    if (retcontext < 0 || force || 
 	(strcmp(prev_context,scontext) != 0 && 	
-	 !(customizable=(force ? 0: (is_context_customizable(prev_context) > 0))))) {
+	 !(customizable=is_context_customizable(prev_context) > 0))) {
       if (outfile) {
 	fprintf(outfile, "%s\n", filename);
       }
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.21.20/scripts/genhomedircon
--- nsapolicycoreutils/scripts/genhomedircon	2005-03-01 22:58:52.000000000 -0500
+++ policycoreutils-1.21.20/scripts/genhomedircon	2005-02-28 14:48:19.000000000 -0500
@@ -222,7 +222,7 @@
         users=""
 	rc = commands.getstatusoutput('grep "^user" %s' % self.getSystemUsersFile())
 	if rc[0] == 0:
-            users+=rc[1]
+                users+=rc[1]+"\n"
 	rc = commands.getstatusoutput("grep ^user %s" % self.getUsersFile())
 	if rc[0] == 0:
                 users+=rc[1]