diff --git a/zsh-5.7.1-test-2.tar.xz b/zsh-5.7.1-test-2.tar.xz
new file mode 100644
index 0000000..46fff64
--- /dev/null
+++ b/zsh-5.7.1-test-2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6036e53b8dc417030e6ef9901ed82e2df8455f18f6e1b6264212caf2341f9ac6
+size 3180532
diff --git a/zsh-5.7.1-test-2.tar.xz.asc b/zsh-5.7.1-test-2.tar.xz.asc
new file mode 100644
index 0000000..724aba0
--- /dev/null
+++ b/zsh-5.7.1-test-2.tar.xz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAl3+3oYACgkQrPgUbK6M
+u8QI9gf9GLHCdE1IwWV0aWjoZRYjQ7UhoGu8ZWGk5CFqkWM69FhZvvtc3/tl7Zxr
+APn3GNGayLQ+ub2eZR/dw/2lI21FeF6tnYabdedfs88mkuj2MbGIDQV1iGVAmGbG
+pTzemf2+3UaeHs6M6mc7juwlmhRoHaeM8wCkGdcGpbsD+LAon5+AMg1PTyZOnXuU
+ql3mifDTDoNo8ME3xc0/67g33tpmCHKAISN900B65yCBtWv0st7JMULpAUGWlhrG
+g4etSaWo6oyby4DKTIe5udvDfPCDe3lbI0UMStt4/TzAgV/0WJb4BKMLxJ+4w1Tj
+dm+TvPXQnb5n6Bnx1fryfXzjOExEpw==
+=mYIM
+-----END PGP SIGNATURE-----
diff --git a/zsh-5.7.1.tar.xz b/zsh-5.7.1.tar.xz
deleted file mode 100644
index 60a88bb..0000000
--- a/zsh-5.7.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7260292c2c1d483b2d50febfa5055176bd512b32a8833b116177bf5f01e77ee8
-size 3126308
diff --git a/zsh-5.7.1.tar.xz.asc b/zsh-5.7.1.tar.xz.asc
deleted file mode 100644
index 0c0cf4c..0000000
--- a/zsh-5.7.1.tar.xz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAlxXSocACgkQrPgUbK6M
-u8SXPgf/Vw+pYfQXAlGy59MsmArJvU+72zP/Q8Cu9gSuLbNZetwR8Zkubibi1rpO
-zCFn0Ps9lR565k9ue+wPUtBhZjEPJVjNALdJK5YaKvh6Dir3/nhoVoS4kobJCHad
-k8X6ThID8zOwZ3E49n+2AiNxwKkSej6cUKzZ2CSGaZ077GgnY4M8y6ACSdwEp7w8
-f5W9gUMqxawx0PCfsxkoJNdNrWq0V2WAgVql3qqVqSvLzAijFXUqtDEauwHecDkw
-5NqWZVHLqJHWHyYImjo/RQnVcGHLCYLSOiHH9duo1VnLsXUNPC9+8yjTRkEte8UA
-38bf8N8gmpaI/sG1Z2v12VXqCV3eqA==
-=g3Uh
------END PGP SIGNATURE-----
diff --git a/zsh.changes b/zsh.changes
index 4265e6a..64d1d08 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Sun Dec 22 09:19:39 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
+
+- Update to version 5.8~pre2 (5.7.1-test-2)
+- Drop 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch, fixed
+  upstream.
+
+-------------------------------------------------------------------
+Mon Dec 16 15:03:50 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
+
+- Add 1baf0d1f553631ecb641e98f4bf48bc2a44e5b82.patch to fix a
+  re-entrancy problem.
+
+-------------------------------------------------------------------
+Mon Dec 16 10:08:27 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
+
+- Update to version 5.8~pre1 (5.7.1-test-1)
+  * The zsh/zutil module's zparseopts builtin learnt an -F option to abort
+    parsing when an unrecognised option-like parameter is encountered.
+  * The zsh/files module gained a chmod builtin.
+  * Several changes have been made to the way completion functions track
+    'precommands' (such as `command` and `env`) and determine whether the
+    command being completed for is a shell builtin. Developers of completion
+    functions may wish to familiarise themselves with `_normal -p` and
+    `_pick_variant -b`.
+  * The option CD_SILENT was added to suppress all output from cd (whether
+    explicit or implicit with AUTO_CD). It is disabled by default.
+  * The compadd builtin's -o option now takes an optional argument to
+    specify the order of completion matches. This affects the display
+    of candidate matches and the order in which they are selected when
+    cycling between them using menu completion.
+  * The :h and :t modifiers in parameter expansion (if braces are present),
+    glob qualifiers and history expansion may take following decimal digit
+    arguments in order to keep that many leading or trailing path components
+    instead of the defaults of all but one (:h) and one (:t).  In an absolute
+    path the leading '/' counts as one component.
+  * The functions builtin gained a -c option to efficiently copy functions.
+- See included ChangeLog for the complete list of changes.
+
 -------------------------------------------------------------------
 Mon Feb  4 13:15:17 UTC 2019 - Ismail Dönmez <idonmez@suse.com>
 
diff --git a/zsh.spec b/zsh.spec
index 8c69fd2..a1b2640 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package zsh
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,9 @@
 #
 
 
+# Only for -test builds
+%define _version 5.7.1-test-2
+
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
 %if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700
 %global __requires_exclude ^/bin/zsh$
@@ -25,14 +28,14 @@ BuildRequires:  texi2html
 BuildRequires:  texinfo
 %endif
 Name:           zsh
-Version:        5.7.1
+Version:        5.8~pre2
 Release:        0%{?dist}
 Summary:        Shell with comprehensive completion
 License:        MIT
 Group:          System/Shells
-Url:            http://www.zsh.org
-Source0:        https://downloads.sourceforge.net/project/zsh/zsh/%{version}/zsh-%{version}.tar.xz
-Source1:        https://downloads.sourceforge.net/project/zsh/zsh/%{version}/zsh-%{version}.tar.xz.asc
+URL:            http://www.zsh.org
+Source0:        https://downloads.sourceforge.net/project/zsh/zsh-test/%{_version}/zsh-%{_version}.tar.xz
+Source1:        https://downloads.sourceforge.net/project/zsh/zsh-test/%{_version}/zsh-%{_version}.tar.xz.asc
 Source2:        %{name}.keyring
 Source3:        zshrc
 Source4:        zshenv
@@ -91,7 +94,7 @@ mechanism, and more.
 This package contains the Zsh manual in HTML format.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{_version}
 %if 0%{?suse_version}
 %patch1 -p1
 %endif