diff -urN samba3.old/Makefile samba3/Makefile
--- samba3.old/Makefile	Fri Sep  3 14:49:19 2004
+++ samba3/Makefile	Thu Sep  9 14:08:16 2004
@@ -249,12 +249,13 @@
 .endif
 
 .if defined(WITH_I18N)
-IGNORE=			"I18N patch not ported yet!"
+#IGNORE=			"I18N patch not ported yet!"
 # Based on patch from miraclelinux.com.
 # http://www.miraclelinux.com/english/technet/samba30/index.html
 PATCH_SITES=		http://dist.bsdlab.org/
-PATCHFILES=		samba-3.0.4-i18n-20040521.bz2
-PATCH_DIST_STRIP=	-p1
+PATCHFILES=		samba-3.0.6-i18n-20040904.bz2
+#PATCH_DIST_STRIP=	-p1
+EXTRA_PATCHES+=		${PATCHDIR}/i18n-fix.patch
 PLIST_SUB+=		I18N=""
 .else
 PLIST_SUB+=		I18N="@comment "
diff -urN samba3.old/distinfo samba3/distinfo
--- samba3.old/distinfo	Fri Sep  3 14:49:19 2004
+++ samba3/distinfo	Thu Sep  9 10:31:00 2004
@@ -1,6 +1,4 @@
 MD5 (samba-3.0.6.tar.gz) = c8dc06e2bcf63513c2e8d849f6352d8a
 SIZE (samba-3.0.6.tar.gz) = 14947376
-MD5 (samba-3.0.5.tar.gz) = 5896ad33676e3c26efaab5dcd897c466
-SIZE (samba-3.0.5.tar.gz) = 15076996
-MD5 (samba-3.0.4-i18n-20040521.bz2) = 24158c2fd00b47ff5b0bcad23cae16e1
-SIZE (samba-3.0.4-i18n-20040521.bz2) = 18982
+MD5 (samba-3.0.6-i18n-20040904.bz2) = ea808ba31e6ed14023217b8718b7fc65
+SIZE (samba-3.0.6-i18n-20040904.bz2) = 17016
diff -urN samba3.old/files/i18n-fix.patch samba3/files/i18n-fix.patch
--- samba3.old/files/i18n-fix.patch	Thu Jan  1 09:00:00 1970
+++ samba3/files/i18n-fix.patch	Thu Sep  9 14:18:58 2004
@@ -0,0 +1,33 @@
+diff -urN modules/vfs_afsacl.c modules/vfs_afsacl.c
+--- modules/vfs_afsacl.c	Thu Aug 19 22:39:12 2004
++++ modules/vfs_afsacl.c	Thu Sep  9 14:00:50 2004
+@@ -116,7 +116,7 @@
+ 	fstrcpy(user, p+1);
+ 	fstrcpy(domain, domuser);
+ 	domain[PTR_DIFF(p, domuser)] = 0;
+-	strupper_m(domain);
++	strupper_m(domain, sizeof(fstring));
+ 	
+ 	return True;
+ }
+@@ -748,7 +748,7 @@
+ 				fstr_sprintf(name, "%s%s%s",
+ 					     dom_name, lp_winbind_separator(),
+ 					     only_username);
+-				strlower_m(name);
++				strlower_m(name, sizeof(fstring));
+ 			}
+ 		}
+ 
+diff -urN rpcclient/cmd_spoolss.c rpcclient/cmd_spoolss.c
+--- rpcclient/cmd_spoolss.c	Thu Sep  9 13:47:14 2004
++++ rpcclient/cmd_spoolss.c	Thu Sep  9 14:06:01 2004
+@@ -576,7 +576,7 @@
+ 	}
+ 
+ 	slprintf(servername, sizeof(servername)-1, "\\\\%s", cli->desthost);
+-	strupper_m(servername);
++	strupper_m(servername, sizeof(servername));
+ 	fstrcpy(printername, argv[1]);
+ 	fstrcpy(user, cli->user_name);
+