diff --git a/zsh-5.7.1-test-3.tar.xz b/zsh-5.7.1-test-3.tar.xz
deleted file mode 100644
index 62e6a7e..0000000
--- a/zsh-5.7.1-test-3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7aa7ba117168c604a724a526c381be0104be5f1b51c277d70afc5064e2566441
-size 3188996
diff --git a/zsh-5.7.1-test-3.tar.xz.asc b/zsh-5.7.1-test-3.tar.xz.asc
deleted file mode 100644
index cb5b543..0000000
--- a/zsh-5.7.1-test-3.tar.xz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAl48cpcACgkQrPgUbK6M
-u8Qnvwf/Qpgsr4FFQ1kcNL8QSABQ+K4d1PerINnjqwyQuzoVdo1aOHMyANKgocYA
-1XkpgKNCLAO3U6gbHdDhMsHEKcYG/h4Ja1v5UHoE3tu72pbS+iI9Vr2Q0lEdiC0X
-Ltx+YOZ6AeLeWPd1gxkbne05VOgQNpRFK01MhMWngDUZCwdY52rETgXdUfGJDEHP
-4+y1B0gRUacezyj+cGSTSXTjw6KvjmzC+I+nS6Zpm6jkoRHg7f6KuAXHxKZwbYqF
-DVA7PDbPaNCZNyErDz7BRLYP2JI04jsNyQGzg+xSRLRCPc+1+ZPiURQDelrBGe1K
-5sYQq63Gad8UdZc3vnSZcm1ckVIO7Q==
-=E3+G
------END PGP SIGNATURE-----
diff --git a/zsh-5.8.tar.xz b/zsh-5.8.tar.xz
new file mode 100644
index 0000000..77b0e94
--- /dev/null
+++ b/zsh-5.8.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27
+size 3193284
diff --git a/zsh-5.8.tar.xz.asc b/zsh-5.8.tar.xz.asc
new file mode 100644
index 0000000..0b84023
--- /dev/null
+++ b/zsh-5.8.tar.xz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEfKfsqvBiFrkPiUFGrPgUbK6Mu8QFAl5HHTEACgkQrPgUbK6M
+u8Ttmwf/U1HoG30yYZ4m3yxFZ8QGI0WwnV7/IAQ4rMBWo+31yijLrwnl8+WILVfi
+gRzskwTrVmLjklT4hnv3aSyO1KtQMDImCYw01JbK801JCnCRRRTKVTC69S1TQ9FI
+mp+GB+QemYAdDRZwIlZcuVmhL7MJS0IWZiwqzlvqyKGG4MCrzqPqKO3s/JgMisUG
+KLHZJWoUWidYfmuwkPRKXN+dcnZUF4B/jJbNwLRGhvySzpT6pAwI2SBWak+vUbs/
+UKal6pOHYv1zalMrh5as2/hAo4Rjpsgn0zRGiFsn5Ys9srB6XKhXifUP6d1g3cRj
+lH9B3QGrd1oh7u8IOjU29F8+DeeU+g==
+=+BhZ
+-----END PGP SIGNATURE-----
diff --git a/zsh.changes b/zsh.changes
index d1c2922..a6cd2cd 100644
--- a/zsh.changes
+++ b/zsh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 17 05:18:47 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
+
+- Update to version 5.8
+  * Fixes CVE-2019-20044 bsc#1163882
+
 -------------------------------------------------------------------
 Fri Feb  7 12:07:51 UTC 2020 - Ismail Dönmez <idonmez@suse.com>
 
diff --git a/zsh.spec b/zsh.spec
index 8bf54d4..b68b6dd 100644
--- a/zsh.spec
+++ b/zsh.spec
@@ -16,9 +16,6 @@
 #
 
 
-# Only for -test builds
-%define _version 5.7.1-test-3
-
 %if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version}
 %if 0%{?rhel_version} >= 700 || 0%{?centos_version} >= 700
 %global __requires_exclude ^/bin/zsh$
@@ -28,14 +25,14 @@ BuildRequires:  texi2html
 BuildRequires:  texinfo
 %endif
 Name:           zsh
-Version:        5.8~pre3
+Version:        5.8
 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-test/%{_version}/zsh-%{_version}.tar.xz
-Source1:        https://downloads.sourceforge.net/project/zsh/zsh-test/%{_version}/zsh-%{_version}.tar.xz.asc
+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
 Source2:        %{name}.keyring
 Source3:        zshrc
 Source4:        zshenv
@@ -94,7 +91,7 @@ mechanism, and more.
 This package contains the Zsh manual in HTML format.
 
 %prep
-%setup -q -n %{name}-%{_version}
+%setup -q
 %if 0%{?suse_version}
 %patch1 -p1
 %endif