diff --git a/0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch b/0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch
new file mode 100644
index 0000000..d94f989
--- /dev/null
+++ b/0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch
@@ -0,0 +1,27 @@
+From 292d93f5f3cbb9d343b75fb4fc570140004d93f5 Mon Sep 17 00:00:00 2001
+From: Marius Tomaschewski <mt@suse.de>
+Date: Tue, 6 May 2014 14:13:21 +0200
+Subject: [PATCH] blacklist ifcfg files ending in .orig or tilde (bnc#871600)
+Upstream: yes
+References: bnc#871600
+
+---
+ src/backend-suse.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/backend-suse.c b/src/backend-suse.c
+index dff529a..0aed475 100644
+--- a/src/backend-suse.c
++++ b/src/backend-suse.c
+@@ -803,7 +803,7 @@ static int
+ __suse_ifcfg_valid_name(const char *name)
+ {
+ 	const char *bl_suffix[] = {
+-	    ".old", ".bak", ".scpmbackup",
++	    "~", ".old", ".bak", ".orig", ".scpmbackup",
+ 	    ".rpmnew", ".rpmsave", ".rpmorig"
+ 	};
+ 	size_t nlen, slen, n;
+-- 
+1.8.4.5
+
diff --git a/netcontrol.changes b/netcontrol.changes
index c7b7e0a..d597e71 100644
--- a/netcontrol.changes
+++ b/netcontrol.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May  6 11:58:04 UTC 2014 - mt@suse.de
+
+- blacklist ifcfg files ending in .orig or tilde (bnc#871600)
+  [+0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch]
+
 -------------------------------------------------------------------
 Fri Jan 10 10:55:26 UTC 2014 - mt@suse.de
 
diff --git a/netcontrol.spec b/netcontrol.spec
index 9541564..70d2577 100644
--- a/netcontrol.spec
+++ b/netcontrol.spec
@@ -50,6 +50,7 @@ Requires:       sysconfig >= 0.80.0
 %else
 Requires:       sysconfig >= 0.71.0
 %endif
+Patch1:         0001-blacklist-ifcfg-files-ending-in-.orig-or-tilde-bnc-8.patch
 
 %description
 A interim network configuration library, currently implementing the
@@ -102,6 +103,7 @@ Authors:
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 export CFLAGS="-W -Wall $RPM_OPT_FLAGS"