diff --git a/libsemanage-rhat.patch b/libsemanage-rhat.patch
index e2a8a69..535555e 100644
--- a/libsemanage-rhat.patch
+++ b/libsemanage-rhat.patch
@@ -1,7 +1,19 @@
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.15/src/genhomedircon.c
---- nsalibsemanage/src/genhomedircon.c	2008-01-28 16:52:22.000000000 -0500
-+++ libsemanage-2.0.15/src/genhomedircon.c	2008-01-25 10:28:39.000000000 -0500
-@@ -406,7 +406,6 @@
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libsemanage-2.0.25/src/genhomedircon.c
+--- nsalibsemanage/src/genhomedircon.c	2008-06-12 23:25:16.000000000 -0400
++++ libsemanage-2.0.25/src/genhomedircon.c	2008-07-17 14:32:45.000000000 -0400
+@@ -192,6 +193,11 @@
+ 			goto done;
+ 	}
+ 
++	if (ustr_cmp_suffix_cstr_eq(expr, "/")) {
++		if (!ustr_del(&expr, 1))
++			goto done;
++	}
++
+ 	/* Append pattern to eat up trailing slashes */
+ 	if (!ustr_add_cstr(&expr, "/*$"))
+ 		goto done;
+@@ -482,7 +488,6 @@
  				  const char *role_prefix)
  {
  	replacement_pair_t repl[] = {
@@ -9,7 +21,7 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libseman
  		{.search_for = TEMPLATE_HOME_DIR,.replace_with = home},
  		{.search_for = TEMPLATE_ROLE,.replace_with = role_prefix},
  		{NULL, NULL}
-@@ -466,7 +465,6 @@
+@@ -542,7 +547,6 @@
  	replacement_pair_t repl[] = {
  		{.search_for = TEMPLATE_USER,.replace_with = user},
  		{.search_for = TEMPLATE_ROLE,.replace_with = role_prefix},
@@ -17,9 +29,9 @@ diff --exclude-from=exclude -N -u -r nsalibsemanage/src/genhomedircon.c libseman
  		{NULL, NULL}
  	};
  	Ustr *line = USTR_NULL;
-diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.15/src/semanage.conf
---- nsalibsemanage/src/semanage.conf	2007-07-16 14:20:38.000000000 -0400
-+++ libsemanage-2.0.15/src/semanage.conf	2008-01-25 10:28:39.000000000 -0500
+diff --exclude-from=exclude -N -u -r nsalibsemanage/src/semanage.conf libsemanage-2.0.25/src/semanage.conf
+--- nsalibsemanage/src/semanage.conf	2008-06-12 23:25:16.000000000 -0400
++++ libsemanage-2.0.25/src/semanage.conf	2008-07-17 13:58:44.000000000 -0400
 @@ -35,4 +35,4 @@
  # given in <sepol/policydb.h>.  Change this setting if a different
  # version is necessary.
diff --git a/libsemanage.spec b/libsemanage.spec
index 4b959bc..8cbc0c9 100644
--- a/libsemanage.spec
+++ b/libsemanage.spec
@@ -3,7 +3,7 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsemanage
 Version: 2.0.25
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://www.nsa.gov/selinux/archives/libsemanage-%{version}.tgz
@@ -78,6 +78,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/*
 
 %changelog
+* Thu Jun 17 2008 Dan Walsh <dwalsh@redhat.com> - 2.0.25-3
+- Another fix for genhomedircon
+
 * Wed May 28 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.25-2
 - fix license tag