diff --git a/.gitignore b/.gitignore
index e12eddc..ac4a0f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qtwebchannel-opensource-src-5.7.1.tar.xz
+/qtwebchannel-opensource-src-5.8.0.tar.xz
diff --git a/qt5-qtwebchannel.spec b/qt5-qtwebchannel.spec
index 0d52e4c..b423827 100644
--- a/qt5-qtwebchannel.spec
+++ b/qt5-qtwebchannel.spec
@@ -1,28 +1,27 @@
 %global qt_module qtwebchannel
 
-%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 - WebChannel component
 Name:    qt5-%{qt_module}
-Version: 5.7.1
-Release: 3%{?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.io
-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
 
+BuildRequires: cmake
 BuildRequires: qt5-qtbase-devel >= %{version}
 BuildRequires: pkgconfig(Qt5Core)
 BuildRequires: pkgconfig(Qt5Quick)
-# Qt5WebSockets package is optional and only needed for some examples
 BuildRequires: pkgconfig(Qt5WebSockets)
 
-%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
-
 %description
 The Qt WebChannel module provides a library for seamless integration of C++
 and QML applications with HTML/JavaScript clients. Any QObject can be
@@ -40,19 +39,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}}
@@ -125,12 +123,8 @@ popd
 
 
 %changelog
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.7.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Sat Dec 10 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-2
-- drop BR: cmake (handled by qt5-rpm-macros now)
-- 5.7.1 dec5 snapshot
+* Mon Jan 30 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-1
+- New upstream version
 
 * Wed Nov 09 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.1-1
 - New upstream version
diff --git a/sources b/sources
index f291022..4df2b7e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtwebchannel-opensource-src-5.7.1.tar.xz) = 643ca738e07c9a719d1d17ee23faf0d7bb3a62e6ee03e5b4f78e1cdf8d1b13ed71416b86bbb40c93d121a6569dc55d0373f1cb0961c8db07762c93592ca49af8
+SHA512 (qtwebchannel-opensource-src-5.8.0.tar.xz) = 3f9b8fa1897ebce5065e38f9f324ede1d2dfb4e13b90dc832a7dd2dfd1f18934d976ab3654fd2fa9fd788e48dec6ebf5766862900cd1523a11f063c22041260a