diff -Brau samba-3.0.22/source/libads/kerberos_keytab.c samba-3.0.22.mooby/source/libads/kerberos_keytab.c
--- samba-3.0.22/source/libads/kerberos_keytab.c	2005-03-18 15:56:41.000000000 +0100
+++ samba-3.0.22.mooby/source/libads/kerberos_keytab.c	2006-04-11 22:16:12.000000000 +0200
@@ -447,14 +447,14 @@
 
 	memset(princ_s, '\0', sizeof(princ_s));
 
-	ret = ads_keytab_add_entry(ads, "host");
+	ret = ads_keytab_add_entry(ads, "HOST");
 	if (ret) {
-		DEBUG(1,("ads_keytab_create_default: ads_keytab_add_entry failed while adding 'host'.\n"));
+		DEBUG(1,("ads_keytab_create_default: ads_keytab_add_entry failed while adding 'HOST'.\n"));
 		return ret;
 	}
-	ret = ads_keytab_add_entry(ads, "cifs");
+	ret = ads_keytab_add_entry(ads, "CIFS");
 	if (ret) {
-		DEBUG(1,("ads_keytab_create_default: ads_keytab_add_entry failed while adding 'cifs'.\n"));
+		DEBUG(1,("ads_keytab_create_default: ads_keytab_add_entry failed while adding 'CIFS'.\n"));
 		return ret;
 	}
 
diff -Brau samba-3.0.22/source/libads/ldap.c samba-3.0.22.mooby/source/libads/ldap.c
--- samba-3.0.22/source/libads/ldap.c	2006-02-23 17:29:34.000000000 +0100
+++ samba-3.0.22.mooby/source/libads/ldap.c	2006-04-11 22:13:06.000000000 +0200
@@ -1314,12 +1314,10 @@
 
 	/* Add the extra principal */
 	psp1 = talloc_asprintf(ctx, "%s/%s", spn, machine_name);
-	strupper_m(psp1);
 	strlower_m(&psp1[strlen(spn)]);
 	DEBUG(5,("ads_add_service_principal_name: INFO: Adding %s to host %s\n", psp1, machine_name));
 	servicePrincipalName[0] = psp1;
 	psp2 = talloc_asprintf(ctx, "%s/%s.%s", spn, machine_name, ads->config.realm);
-	strupper_m(psp2);
 	strlower_m(&psp2[strlen(spn)]);
 	DEBUG(5,("ads_add_service_principal_name: INFO: Adding %s to host %s\n", psp2, machine_name));
 	servicePrincipalName[1] = psp2;
@@ -1328,7 +1326,6 @@
 	 * the KDC doesn't send "server principal unknown" errors to clients
 	 * which use the DNS name in determining service principal names. */
 	psp3 = talloc_asprintf(ctx, "%s/%s", spn, my_fqdn);
-	strupper_m(psp3);
 	strlower_m(&psp3[strlen(spn)]);
 	if (strcmp(psp2, psp3) != 0) {
 		DEBUG(5,("ads_add_service_principal_name: INFO: Adding %s to host %s\n", psp3, machine_name));