diff -Naur NetworkManager-0.9.6.0/src/nm-policy.c NetworkManager-0.9.6.0-magellan/src/nm-policy.c
--- NetworkManager-0.9.6.0/src/nm-policy.c	2012-08-02 22:41:52.000000000 +0200
+++ NetworkManager-0.9.6.0-magellan/src/nm-policy.c	2012-08-22 16:35:48.631981111 +0200
@@ -315,6 +315,7 @@
 		return;
 	}
 
+#if 0
 	/* Try automatically determined hostname from the best device's IP config */
 	if (!best4)
 		best4 = get_best_ip4_device (policy->manager);
@@ -369,6 +370,7 @@
 		}
 	}
 
+#endif
 	/* If no automatically-configured hostname, try using the hostname from
 	 * when NM started up.
 	 */