diff --git a/samba-3.0.26a-winbindd-padding.patch b/samba-3.0.26a-winbindd-padding.patch
new file mode 100644
index 0000000..762bfaa
--- /dev/null
+++ b/samba-3.0.26a-winbindd-padding.patch
@@ -0,0 +1,24 @@
+--- samba-3.0.26a/source/nsswitch/winbindd_nss.h.orig	2007-10-18 12:43:25.000000000 -0400
++++ samba-3.0.26a/source/nsswitch/winbindd_nss.h	2007-10-18 12:43:41.000000000 -0400
+@@ -319,7 +319,7 @@
+ 		   The size is the sizeof the union without the padding aligned on 
+ 		   an 8 byte boundary.   --jerry */
+ 
+-		char padding[1560];
++		char padding[1800];
+ 	} data;
+ 	union {
+ 		SMB_TIME_T padding;
+--- samba-3.0.26a/source/nsswitch/winbindd.c.orig	2007-10-18 12:44:24.000000000 -0400
++++ samba-3.0.26a/source/nsswitch/winbindd.c	2007-10-18 12:44:55.000000000 -0400
+@@ -540,8 +540,8 @@
+ 	}
+ 
+ 	if (*(uint32 *)(&state->request) != sizeof(state->request)) {
+-		DEBUG(0,("request_len_recv: Invalid request size received: %d\n",
+-			 *(uint32 *)(&state->request)));
++		DEBUG(0,("request_len_recv: Invalid request size received: %d (expected %d)\n",
++			 *(uint32 *)(&state->request), sizeof(state->request)));
+ 		state->finished = True;
+ 		return;
+ 	}
diff --git a/samba.spec b/samba.spec
index 16feb80..10cca44 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: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -42,6 +42,7 @@ Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
 Patch201: samba3_idmap_default_domain.patch
+Patch202: samba-3.0.26a-winbindd-padding.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -159,6 +160,7 @@ cp %{SOURCE11} packaging/Fedora/
 %patch111 -p1 -b .smbclient
 %patch200 -p0 -b .inotify
 %patch201 -p0 -b .idmap_def_dom
+%patch202 -p1 -b .winbindd_padding
 
 mv source/VERSION source/VERSION.orig
 sed -e 's/SAMBA_VERSION_VENDOR_SUFFIX=$/&\"%{release}\"/' < source/VERSION.orig > source/VERSION
@@ -644,6 +646,9 @@ exit 0
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Thu Oct 16 2007 Simo Sorce <ssorce@redhat.com> 3.0.26a-6.fc7
+- Fix bug 253036
+
 * Sun Oct 14 2007 Simo Sorce <ssorce@redhat.com> 3.0.26a-5.fc7
 - Fix default domain patch turned out to be incomplete, fixed