diff --git a/ypbind-sigpipe.patch b/ypbind-sigpipe.patch
new file mode 100644
index 0000000..ce3ced6
--- /dev/null
+++ b/ypbind-sigpipe.patch
@@ -0,0 +1,11 @@
+diff -up ypbind-mt-1.36/src/ypbind-mt.c.sigpipe ypbind-mt-1.36/src/ypbind-mt.c
+--- ypbind-mt-1.36/src/ypbind-mt.c.sigpipe	2012-07-23 10:02:12.275896834 +0200
++++ ypbind-mt-1.36/src/ypbind-mt.c	2012-07-23 10:02:47.430632798 +0200
+@@ -432,6 +432,7 @@ sig_handler (void *v_param  __attribute_
+   sigaddset (&sigs_to_catch, SIGQUIT);
+   sigaddset (&sigs_to_catch, SIGSEGV);
+   sigaddset (&sigs_to_catch, SIGHUP);
++  sigaddset (&sigs_to_catch, SIGPIPE);
+ 
+   while (1)
+     {
diff --git a/ypbind.spec b/ypbind.spec
index bb44516..33c89f7 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.36
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: http://www.linux-nis.org/download/ypbind-mt/ypbind-mt-%{version}.tar.bz2
@@ -17,6 +17,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-sigpipe.patch
 # This is for /bin/systemctl
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -49,6 +50,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 .sigpipe
 
 %build
 %configure --enable-dbus-nm
@@ -113,6 +115,10 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Mon Jul 23 2012 Honza Horak <hhorak@redhat.com> - 3:1.36-4
+- Add SIGPIPE to proper signal set
+  Related: #842228
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3:1.36-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild