diff --git a/samba.spec b/samba.spec
index f2ed46a..c136acc 100644
--- a/samba.spec
+++ b/samba.spec
@@ -2,7 +2,7 @@ Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
 Version: 3.0.26a
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -645,6 +645,9 @@ exit 0
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Sun Oct 14 2007 Simo Sorce <ssorce@redhat.com> 3.0.26a-5.fc8
+- Fix default domain patch turned out to be incomplete, fixed
+
 * Thu Oct 11 2007 Simo Sorce <ssorce@redhat.com> 3.0.26a-4.fc8
 - Fix idmap_rid module with compatible config syntax
 
diff --git a/samba3_idmap_default_domain.patch b/samba3_idmap_default_domain.patch
index a5505a8..84f8f14 100644
--- a/samba3_idmap_default_domain.patch
+++ b/samba3_idmap_default_domain.patch
@@ -50,6 +50,16 @@ Index: source/nsswitch/idmap.c
  	}
  
  	/***************************
+@@ -389,7 +389,8 @@
+ 			continue;
+ 		}
+ 
+-		if (strequal(dom_list[i], lp_workgroup())) {
++		if ((dom_list[i] != default_domain) &&
++		    strequal(dom_list[i], lp_workgroup())) {
+ 			pri_dom_is_in_list = True;
+ 		}
+ 		/* init domain */
 @@ -398,10 +411,10 @@
  						   "default", False);