diff --git a/.cvsignore b/.cvsignore
index 261319b..583dcbd 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -83,3 +83,4 @@ libsemanage-2.0.1.tgz
 libsemanage-2.0.2.tgz
 libsemanage-2.0.3.tgz
 libsemanage-2.0.4.tgz
+libsemanage-2.0.5.tgz
diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch
index 81a85d9..0fb4b42 100644
--- a/libsemanage-rhat.patch
+++ b/libsemanage-rhat.patch
@@ -74,10 +74,25 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/libsemanage.map libseman
  	  semanage_user_*; semanage_bool_*; semanage_seuser_*;
  	  semanage_iface_*; semanage_port_*; semanage_context_*;
  	  semanage_node_*;
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_conf.h libsemanage-2.0.3/src/semanage_conf.h
+--- nsalibsemanage/src/semanage_conf.h	2007-08-23 16:52:25.000000000 -0400
++++ libsemanage-2.0.3/src/semanage_conf.h	2007-04-25 20:02:29.000000000 -0400
+@@ -37,10 +37,10 @@
+ 	int expand_check;
+ 	int save_previous;
+ 	int save_linked;
+-	int disable_genhomedircon;
+ 	mode_t file_mode;
+ 	struct external_prog *load_policy;
+ 	struct external_prog *setfiles;
++	struct external_prog *genhomedircon;
+ 	struct external_prog *mod_prog, *linked_prog, *kernel_prog;
+ } semanage_conf_t;
+ 
 diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsemanage-2.0.3/src/semanage_store.c
---- nsalibsemanage/src/semanage_store.c	2007-07-16 14:20:38.000000000 -0400
+--- nsalibsemanage/src/semanage_store.c	2007-08-23 16:52:25.000000000 -0400
 +++ libsemanage-2.0.3/src/semanage_store.c	2007-08-11 06:40:28.000000000 -0400
-@@ -1120,7 +1120,7 @@
+@@ -1130,7 +1120,7 @@
  
        skip_reload:
  
@@ -86,12 +101,3 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage_store.c libsema
  	     semanage_exec_prog(sh, sh->conf->setfiles, store_pol,
  				store_fc)) != 0) {
  		ERR(sh, "setfiles returned error code %d.", r);
-@@ -1262,7 +1262,7 @@
- 		goto cleanup;
- 	}
- 
--	if ((retval =
-+	if (sh->do_rebuild_file_context && (retval =
- 	     semanage_exec_prog(sh, sh->conf->genhomedircon,
- 				sh->conf->store_path, "")) != 0) {
- 		ERR(sh, "genhomedircon returned error code %d.", retval);
diff --git a/libsemanage.spec b/libsemanage.spec
index af00603..aa31a04 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -2,7 +2,7 @@
 %define libselinuxver 2.0.0-1
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
-Version: 2.0.4
+Version: 2.0.5
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -78,6 +78,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/*
 
 %changelog
+* Thu Aug 23 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.5-1
+- Upgrade to latest from NSA
+
 * Mon Aug 20 2007 Dan Walsh <dwalsh@redhat.com> - 2.0.4-1
 - Upgrade to latest from NSA
 	* Allow dontaudits to be turned off via semanage interface when
diff --git a/sources b/sources
index 6793192..cffe0db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-947b51b687e2fe0b5b591df8f2994ff1  libsemanage-2.0.4.tgz
+9d34a0b2f3033ee90489dbb516653b49  libsemanage-2.0.5.tgz