diff --git a/tar-fix_eternal_loop_in_handle_option.patch b/tar-fix_eternal_loop_in_handle_option.patch
new file mode 100644
index 0000000..44e6a09
--- /dev/null
+++ b/tar-fix_eternal_loop_in_handle_option.patch
@@ -0,0 +1,19 @@
+commit c13948fd0aef759e95038bd28416077b12f7dd29
+Author: Vitezslav Cizek <vcizek@suse.cz>
+Date:   Wed Mar 26 18:34:53 2014 +0100
+
+    fix an eternal loop in handle_option
+
+diff --git a/src/names.c b/src/names.c
+index 9fc0ad5..963ec07 100644
+--- a/src/names.c
++++ b/src/names.c
+@@ -439,7 +439,7 @@ handle_option (const char *str)
+   int i;
+ 
+   while (*str && isspace (*str))
+-    ;
++    str++;
+   if (*str != '-')
+     return 1;
+ 
diff --git a/tar.changes b/tar.changes
index fc7fc16..8413756 100644
--- a/tar.changes
+++ b/tar.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 26 17:46:39 UTC 2014 - vcizek@suse.com
+
+- fix an infinite loop in handle_option (bnc#867919 and bnc#870422)
+  * added tar-fix_eternal_loop_in_handle_option.patch
+
 -------------------------------------------------------------------
 Tue Jan  7 11:09:24 CET 2014 - llipavsky@suse.com
 
diff --git a/tar.spec b/tar.spec
index 286f8df..de633b2 100644
--- a/tar.spec
+++ b/tar.spec
@@ -34,6 +34,7 @@ Source2:        tar.keyring
 Patch3:         tar-wildcards.patch
 Patch6:         tar-backup-spec-fix-paths.patch
 Patch7:         tar-1.26-remove_O_NONBLOCK.patch
+Patch8:         tar-fix_eternal_loop_in_handle_option.patch
 Patch10:        paxutils-rtapelib_mtget.patch
 Patch20:        add_readme-tests.patch
 %if 0%{?suse_version} >= %min_suse_ver
@@ -77,6 +78,7 @@ Upstream testsuite for the package
 %patch3 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 %patch10 -p1
 %patch20 -p1