diff --git a/ChangeLog b/ChangeLog
index da1fe8cb6..6804de327 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-27  Robert Love  <rml@novell.com>
+
+	* src/backends/NetworkManagerSuSE.c: Revert 2006-03-17 commit and again
+	  restart, not reload, ypbind.  Unfortunately there is no superior
+	  solution.
+
 2006-03-24  Christopher Aillon  <caillon@redhat.com>
 
 	* gnome/applet/applet-notifications.c:
diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c
index dfd798b58..a18655980 100644
--- a/src/backends/NetworkManagerSuSE.c
+++ b/src/backends/NetworkManagerSuSE.c
@@ -1139,8 +1139,8 @@ void nm_system_activate_nis (NMIP4Config *config)
 
 			if (stat ("/usr/sbin/rcypbind", &sb) != -1)
 			{
-				nm_info ("Asking ypbind to reload its configuration.");
-				nm_spawn_process ("/usr/sbin/rcypbind reload");
+				nm_info ("Restarting ypbind.");
+				nm_spawn_process ("/usr/sbin/rcypbind restart");
 			}
 			if (stat ("/usr/sbin/rcautofs", &sb) != -1)
 			{
@@ -1168,6 +1168,11 @@ 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.");