diff -up NetworkManager-0.7.0/src/NetworkManagerPolicy.c.dont-update-hostname NetworkManager-0.7.0/src/NetworkManagerPolicy.c
--- NetworkManager-0.7.0/src/NetworkManagerPolicy.c.dont-update-hostname	2008-09-20 18:07:44.000000000 -0400
+++ NetworkManager-0.7.0/src/NetworkManagerPolicy.c	2008-09-22 19:59:39.000000000 -0400
@@ -75,6 +75,7 @@ struct NMPolicy {
 	LookupThread *lookup;
 };
 
+#ifdef MODIFY_HOSTNAME
 static gboolean
 lookup_thread_run_cb (gpointer user_data)
 {
@@ -156,6 +157,7 @@ lookup_thread_die (LookupThread *thread)
 	thread->die = TRUE;
 	g_mutex_unlock (thread->lock);
 }
+#endif  /* MODIFY_HOSTNAME */
 
 #define INVALID_TAG "invalid"
 
@@ -256,6 +258,8 @@ get_best_device (NMManager *manager, NMA
 	return best;
 }
 
+#ifdef MODIFY_HOSTNAME
+
 #define FALLBACK_HOSTNAME "localhost.localdomain"
 
 static gboolean
@@ -474,6 +478,7 @@ update_system_hostname (NMPolicy *policy
 		set_system_hostname (NULL, "error starting hostname thread");
 	}
 }
+#endif  /* MODIFY_HOSTNAME */
 
 static void
 update_routing_and_dns (NMPolicy *policy, gboolean force_update)
@@ -545,8 +550,10 @@ update_routing_and_dns (NMPolicy *policy
 		nm_info ("Policy set (%s) as default for routing and DNS.", ip_iface);
 
 out:
+#ifdef MODIFY_HOSTNAME
 	/* Update the system hostname */
 	update_system_hostname (policy, best);
+#endif  /* MODIFY_HOSTNAME */
 
 	policy->default_device = best;	
 }
@@ -639,7 +646,9 @@ global_state_changed (NMManager *manager
 static void
 hostname_changed (NMManager *manager, GParamSpec *pspec, gpointer user_data)
 {
+#ifdef MODIFY_HOSTNAME
 	update_system_hostname ((NMPolicy *) user_data, NULL);
+#endif  /* MODIFY_HOSTNAME */
 }
 
 static void
@@ -940,6 +949,7 @@ nm_policy_destroy (NMPolicy *policy)
 
 	g_return_if_fail (policy != NULL);
 
+#ifdef MODIFY_HOSTNAME
 	/* Tell any existing hostname lookup thread to die, it'll get cleaned up
 	 * by the lookup thread callback.
 	  */
@@ -947,6 +957,7 @@ nm_policy_destroy (NMPolicy *policy)
 		lookup_thread_die (policy->lookup);
 		policy->lookup = NULL;
 	}
+#endif  /* MODIFY_HOSTNAME */
 
 	for (iter = policy->pending_activation_checks; iter; iter = g_slist_next (iter)) {
 		ActivateData *data = (ActivateData *) iter->data;