diff -Naur NetworkManager-0.8.1/src/nm-policy.c NetworkManager-0.8.1-magellan/src/nm-policy.c
--- NetworkManager-0.8.1/src/nm-policy.c	2010-07-22 01:48:36.000000000 +0200
+++ NetworkManager-0.8.1-magellan/src/nm-policy.c	2010-09-27 22:00:47.000000000 +0200
@@ -287,6 +287,7 @@
 		return;
 	}
 
+#if 0
 	/* Try automatically determined hostname from the best device's IP config */
 	if (!best)
 		best = get_best_ip4_device (policy->manager, &best_req);
@@ -317,6 +318,7 @@
 			             dhcp4_hostname);
 		}
 	}
+#endif
 
 	/* If no automatically-configured hostname, try using the hostname from
 	 * when NM started up.