diff -Naur NetworkManager-0.8.9997/src/nm-policy.c NetworkManager-0.8.9997-magellan/src/nm-policy.c
--- NetworkManager-0.8.9997/src/nm-policy.c	2011-05-27 16:28:36.000000000 +0200
+++ NetworkManager-0.8.9997-magellan/src/nm-policy.c	2011-08-05 02:16:33.000000000 +0200
@@ -268,9 +268,11 @@
 update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6)
 {
 	char *configured_hostname = NULL;
+#if 0
 	NMActRequest *best_req4 = NULL;
 	NMActRequest *best_req6 = NULL;
 	const char *dhcp_hostname, *p;
+#endif
 
 	g_return_if_fail (policy != NULL);
 
@@ -296,6 +298,7 @@
 		return;
 	}
 
+#if 0
 	/* Try automatically determined hostname from the best device's IP config */
 	if (!best4)
 		best4 = get_best_ip4_device (policy->manager, &best_req4);
@@ -349,6 +352,7 @@
 			}
 		}
 	}
+#endif
 
 	/* If no automatically-configured hostname, try using the hostname from
 	 * when NM started up.