diff --git a/.gitignore b/.gitignore
index 3a0dbd6..0da1699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qtwebsockets-opensource-src-5.7.1.tar.xz
+/qtwebsockets-opensource-src-5.8.0.tar.xz
diff --git a/qt5-qtwebsockets.spec b/qt5-qtwebsockets.spec
index e4860fc..63883da 100644
--- a/qt5-qtwebsockets.spec
+++ b/qt5-qtwebsockets.spec
@@ -1,20 +1,21 @@
 
 %global qt_module qtwebsockets
 
-%define docs 1
-
-#define prerelease
+# To build without qttools doctools package, just undefine docs
+%ifarch %{arm} %{ix86} x86_64
+%global docs 1
+%endif
 
 Summary: Qt5 - WebSockets component
 Name:    qt5-%{qt_module}
-Version: 5.7.1
-Release: 4%{?dist}
+Version: 5.8.0
+Release: 1%{?dist}
 
 # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
 # See also http://doc.qt.io/qt-5/licensing.html
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url: http://qt-project.org/
-Source0: http://download.qt.io/official_releases/qt/5.7/%{version}%{?prerelease:-%{prerelease}}/submodules/%{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}.tar.xz
+Source0: http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 
 # filter qml provides
 %global __provides_exclude_from ^%{_qt5_archdatadir}/qml/.*\\.so$
@@ -40,18 +41,18 @@ Requires: qt5-qtbase-devel%{?_isa}
 Summary: API documentation for %{name}
 License: GFDL
 Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
+BuildRequires: qt5-doctools
+BuildRequires: qt5-qtbase-doc
 BuildArch: noarch
 %description doc
 %{summary}.
-%endif
 
 %package examples
 Summary: Programming examples for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description examples
 %{summary}.
+%endif
 
 %prep
 %setup -q -n %{qt_module}-opensource-src-%{version}%{?prerelease:-%{prerelease}}
@@ -124,8 +125,8 @@ popd
 
 
 %changelog
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+* Mon Jan 30 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-1
+- New upstream release
 
 * Mon Jan 02 2017 Rex Dieter <rdieter@math.unl.edu> - 5.7.1-3
 - filter qml provides, BR: qtbase qtdeclarative explicitly
diff --git a/sources b/sources
index 197aa4a..1f50ea3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtwebsockets-opensource-src-5.7.1.tar.xz) = 3cca317d71513a0b11d5b46d6caee44d77a7f65eff09dbd6c180ad682a0271924e05efc28e6d31c9e982b6ab0b3fe1370606eea372e2fefd4525237496d2c7c9
+SHA512 (qtwebsockets-opensource-src-5.8.0.tar.xz) = c0e027287fa182d4f491a32d6d3286cc8b42cb4bc25d0631af765c84b0b2a1d61ebdd1819534f711b806d98c07f3e56ffa2bd6f0954c9af23f00c0f17abe3a17