diff --git a/0002-rpcinfo_warmstart-no_warning_about_missing_file.patch b/0002-rpcinfo_warmstart-no_warning_about_missing_file.patch
index 965f0d9..1f5019b 100644
--- a/0002-rpcinfo_warmstart-no_warning_about_missing_file.patch
+++ b/0002-rpcinfo_warmstart-no_warning_about_missing_file.patch
@@ -1,25 +1,26 @@
+From: Thorsten Kukuk <kukuk@suse.com>
+Subject: rpcinfo: warmstart - no warning about missing file
 
 Don't print an error message on warmstart if the
 startup files don't exist.
 
-Signed-off-by: Thorsten Kukuk <kukuk@suse.de>
+---
+ src/warmstart.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
 
 --- a/src/warmstart.c
-+++ b/src/warmstart.c	2014/12/10 15:04:42
-@@ -101,13 +101,13 @@
- {
- 	FILE *fp;
- 	XDR xdrs;
--	 
-+
- 	if (debugging)
++++ b/src/warmstart.c
+@@ -106,9 +106,10 @@ read_struct(char *filename, xdrproc_t st
  		fprintf(stderr, "rpcbind: using '%s' startup file\n", filename);
  
--	if ((fp = fopen(filename, "r")) == NULL) {
-+	if (((fp = fopen(filename, "r")) == NULL) && errno != ENOENT) {
- 		syslog(LOG_ERR,
+ 	if ((fp = fopen(filename, "r")) == NULL) {
+-		syslog(LOG_ERR,
 -			"Cannot open '%s' file for reading, errno %d (%s)", 
-+			"Cannot open '%s' file for reading, errno %d (%s)",
- 			filename, errno, strerror(errno));
+-			filename, errno, strerror(errno));
++                if (errno != ENOENT)
++			syslog(LOG_ERR,
++			   "Cannot open '%s' file for reading, errno %d (%s)",
++			   filename, errno, strerror(errno));
  		goto error;
  	}
+ 
diff --git a/rpcbind.changes b/rpcbind.changes
index 668a6e9..d164179 100644
--- a/rpcbind.changes
+++ b/rpcbind.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 12 17:01:44 UTC 2014 - jeffm@suse.com
+
+- 0002-rpcinfo_warmstart-no_warning_about_missing_file.patch: fix
+  merge issue causing segfaults on missing file (bnc#909619).
+
 -------------------------------------------------------------------
 Thu Dec 11 13:07:09 CET 2014 - kukuk@suse.de
 
diff --git a/rpcbind.spec b/rpcbind.spec
index 34a6afa..62dd649 100644
--- a/rpcbind.spec
+++ b/rpcbind.spec
@@ -35,16 +35,16 @@ BuildRequires:  tcpd-devel
 BuildRequires:  pkgconfig(libsystemd-daemon)
 PreReq:         %fillup_prereq
 Requires(pre):  /usr/sbin/useradd
-Patch1:		0001-systemd-unit-files.patch
-Patch2:		0002-rpcinfo_warmstart-no_warning_about_missing_file.patch
-Patch3:		0003-systemd-no-dualmode.patch
-Patch4:		0004-systemd-sd_notify.patch
-Patch5:		0005-Remove-obsolete-function-in6_fillscopeid.patch
+Patch1:         0001-systemd-unit-files.patch
+Patch2:         0002-rpcinfo_warmstart-no_warning_about_missing_file.patch
+Patch3:         0003-systemd-no-dualmode.patch
+Patch4:         0004-systemd-sd_notify.patch
+Patch5:         0005-Remove-obsolete-function-in6_fillscopeid.patch
 Patch6:         0006-In-init_transport-move-creation-of-COTS-sockets-clos.patch
 Patch7:         0007-The-use-of-AI_NUMERICHOST-in-init_transport-is-broke.patch
 Patch8:         0008-First-part-of-init_transport-refactoring.patch
 Patch9:         0009-init_transport-move-the-registration-code-into-a-sep.patch
-Patch10:	0010-Fix-the-behavior-when-specifying-the-h-option.patch
+Patch10:        0010-Fix-the-behavior-when-specifying-the-h-option.patch
 Patch11:        0011-Clean-up-the-way-we-handle-the-h-option-in-init_tran.patch
 Patch14:        0014-When-using-systemd-redirect-syslog-calls-to-the-syst.patch
 Patch18:        0018-configure-check-for-nss.h.patch