diff --git a/ypbind-mt-1.32-dbus.patch b/ypbind-mt-1.32-dbus.patch
new file mode 100644
index 0000000..9894556
--- /dev/null
+++ b/ypbind-mt-1.32-dbus.patch
@@ -0,0 +1,28 @@
+diff -up ypbind-mt-1.32/src/ypbind_dbus_nm.c.dbus ypbind-mt-1.32/src/ypbind_dbus_nm.c
+--- ypbind-mt-1.32/src/ypbind_dbus_nm.c.dbus	2011-04-07 14:55:56.251110287 +0200
++++ ypbind-mt-1.32/src/ypbind_dbus_nm.c	2011-04-07 16:47:17.747108590 +0200
+@@ -42,13 +42,19 @@
+ #define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
+ 
+ typedef enum NMState {
+-  NM_STATE_UNKNOWN = 0,
+-  NM_STATE_ASLEEP,
+-  NM_STATE_CONNECTING,
+-  NM_STATE_CONNECTED,
+-  NM_STATE_DISCONNECTED
++  NM_STATE_UNKNOWN          = 0,
++  NM_STATE_ASLEEP           = 10,
++  NM_STATE_DISCONNECTED     = 20,
++  NM_STATE_DISCONNECTING    = 30,
++  NM_STATE_CONNECTING       = 40,
++  NM_STATE_CONNECTED_LOCAL  = 50,
++  NM_STATE_CONNECTED_SITE   = 60,
++  NM_STATE_CONNECTED_GLOBAL = 70
+ } NMState;
+ 
++/* For backwards compat */
++#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
++
+ #endif
+ 
+ #define DBUS_MESSAGE_MATCH			\
diff --git a/ypbind.init b/ypbind.init
index f70a15e..b9d30f9 100755
--- a/ypbind.init
+++ b/ypbind.init
@@ -14,6 +14,18 @@
 #
 # See https://fedoraproject.org/wiki/Packaging:SysVInitScript for
 # the guidelines document.
+### BEGIN INIT INFO
+# Provides: ypbind
+# Required-Start: $local_fs $remote_fs $network
+# Required-Stop: $local_fs $remote_fs $network
+# Default-Start: 3 4 5
+# Default-Stop: 0 1 2 6
+# Short-Description: Starts the ypbind daemon
+# Description: This is a daemon which runs on NIS/YP clients and binds them \
+#              to a NIS domain. It must be running for systems based on glibc \
+#              to work as NIS clients, but it should not be enabled on systems \
+#              which are not using NIS.
+### END INIT INFO
 
 OTHER_YPBIND_OPTS=""
 
diff --git a/ypbind.spec b/ypbind.spec
index a030b1e..0a0bd72 100644
--- a/ypbind.spec
+++ b/ypbind.spec
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.32
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -14,6 +14,7 @@ Patch1: ypbind-1.11-gettextdomain.patch
 # Not sent to upstream.
 Patch2: ypbind-mt-1.32-typo.patch
 Patch3: ypbind-mt-1.32-typo2.patch
+Patch4: ypbind-mt-1.32-dbus.patch
 Requires(post): chkconfig
 Requires(preun): chkconfig
 # This is for /sbin/service
@@ -45,6 +46,7 @@ also need to install the ypserv package to a machine on your network.
 %patch1 -p1 -b .gettextdomain
 %patch2 -p1 -b .typo
 %patch3 -p1 -b .typo2
+%patch4 -p1 -b .dbus
 
 %build
 %configure --enable-dbus-nm
@@ -86,6 +88,11 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Wed Apr 06 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-7
+- Added LSB init service definition in ypbind.init.
+- Fix D-Bus response codes to correspond with NetworkManager.
+  (rhbz#693873)
+
 * Fri Mar 18 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-6
 - Added the -typo2 patch which fixes a spelling error in a man pages.
   (rhbz#664870)