diff --git a/.cvsignore b/.cvsignore
index 18f42b7..bed8050 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -88,3 +88,5 @@ policycoreutils-1.29.12.tgz
 policycoreutils-1.29.15.tgz
 policycoreutils-1.29.17.tgz
 policycoreutils-1.29.18.tgz
+policycoreutils-1.29.19.tgz
+policycoreutils-1.29.20.tgz
diff --git a/policycoreutils-rhat.patch b/policycoreutils-rhat.patch
index f9d32ec..73446c8 100644
--- a/policycoreutils-rhat.patch
+++ b/policycoreutils-rhat.patch
@@ -1,6 +1,27 @@
-diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.18/semanage/seobject.py
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/genhomedircon policycoreutils-1.29.20/scripts/genhomedircon
+--- nsapolicycoreutils/scripts/genhomedircon	2006-01-30 18:32:39.000000000 -0500
++++ policycoreutils-1.29.20/scripts/genhomedircon	2006-02-07 10:36:38.000000000 -0500
+@@ -170,7 +170,7 @@
+ 	def heading(self):
+ 		ret = "\n#\n#\n# User-specific file contexts, generated via %s\n" % sys.argv[0]
+ 		if self.semanaged:
+-			ret += "# use seusers command to manage system users in order to change the file_context\n#\n#\n"
++			ret += "# use semanage command to manage system users in order to change the file_context\n#\n#\n"
+ 		else:
+ 			ret += "# edit %s to change file_context\n#\n#\n" % (self.selinuxdir+self.type+"/seusers")
+ 		return ret
+@@ -196,7 +196,7 @@
+ 		return role
+ 		
+ 	def adduser(self, udict, user, seuser, role):
+-		if seuser == "user_u" or user == "__default__":
++		if seuser == "user_u" or user == "__default__" or user == "system_u":
+ 			return
+ 		# !!! chooses first role in the list to use in the file context !!!
+ 		if role[-2:] == "_r" or role[-2:] == "_u":
+diff --exclude-from=exclude -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-1.29.20/semanage/seobject.py
 --- nsapolicycoreutils/semanage/seobject.py	2006-02-02 12:08:04.000000000 -0500
-+++ policycoreutils-1.29.18/semanage/seobject.py	2006-02-03 09:57:03.000000000 -0500
++++ policycoreutils-1.29.20/semanage/seobject.py	2006-02-07 10:35:46.000000000 -0500
 @@ -21,8 +21,11 @@
  #
  #  
diff --git a/policycoreutils.spec b/policycoreutils.spec
index 63509fd..e533a8a 100644
--- a/policycoreutils.spec
+++ b/policycoreutils.spec
@@ -1,10 +1,10 @@
-%define libsepolver 1.11.12-1
-%define libsemanagever 1.5.20-1
-%define libselinuxver 1.29.6-1
+%define libsepolver 1.11.13-1
+%define libsemanagever 1.5.21-1
+%define libselinuxver 1.29.7-1
 Summary: SELinux policy core utilities.
 Name: policycoreutils
-Version: 1.29.18
-Release: 2.1
+Version: 1.29.20
+Release: 1
 License: GPL
 Group: System Environment/Base
 Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@@ -97,10 +97,17 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/python2.4/site-packages/seobject.py*
 
 %changelog
+* Tue Feb 07 2006 Dan Walsh <dwalsh@redhat.com> 1.29.20-1
+- Update from upstream
+	* Merged seuser/user_extra support patch to semodule_package 
+	  from Joshua Brindle.
+	* Merged getopt type fix for semodule_link/expand and sestatus
+	  from Chris PeBenito.
+- Fix genhomedircon output
+
 * Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 1.29.18-2.1
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
-
 * Fri Feb 3 2006 Dan Walsh <dwalsh@redhat.com> 1.29.18-2
 - Add auditing to semanage
 
diff --git a/sources b/sources
index 14919d4..7eb1952 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6980bea91969631d694dda89e8401105  policycoreutils-1.29.18.tgz
+3b3793a52a940f5ec19a077965625b18  policycoreutils-1.29.20.tgz