diff --git a/ChangeLog b/ChangeLog
index 174222fd9..05beee652 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,7 +3,7 @@
 	* src/backends/NetworkManagerSuSE.c: Do "rcypbind reload" to send the
 	  signal SIGHUP to ypbind, not "rcypbind restart" to physically restart
 	  it, in case it is not running in the first place.  We just want its
-	  configuration reloaded.
+	  configuration reloaded.  Also, do not "rcypbind stop" on device down.
 
 2006-03-15  Robert Love  <rml@novell.com>
 
diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c
index bc376ef1f..02be89140 100644
--- a/src/backends/NetworkManagerSuSE.c
+++ b/src/backends/NetworkManagerSuSE.c
@@ -1141,11 +1141,6 @@ void nm_system_shutdown_nis (void)
 {
 	struct stat sb;
 
-	if (stat ("/usr/sbin/rcypbind", &sb) != -1)
-	{
-		nm_info ("Stopping ypbind.");
-		nm_spawn_process ("/usr/sbin/rcypbind stop");
-	}
 	if (stat ("/usr/sbin/rcautofs", &sb) != -1)
 	{
 		nm_info ("Restarting autofs.");
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index da91e92c9..024707386 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -35,16 +35,22 @@ struct NMIP4Config
 {
 	guint	refcount;
 
-	guint32	ip4_address;
+	guint32	ip4_address;src/backends/NetworkManagrerSuSE.c
+	guint32	ip4_ptp_address;
+	guint32	ip4_gateway;
+	guint32	ip4_netmask;guint	refcount;
+
+	guint32	ip4_address;src/backends/NetworkManagrerSuSE.c
 	guint32	ip4_ptp_address;
 	guint32	ip4_gateway;
 	guint32	ip4_netmask;
+
 	guint32	ip4_broadcast;
 
 	GSList *	nameservers;
 	GSList *	domains;
 
-	gchar * hostname;
+	gchar *	hostname;
 	gchar *	nis_domain;
 	GSList *	nis_servers;