diff --git a/.gitignore b/.gitignore
index e1fe407..b288c15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qtwebview-opensource-src-5.7.1.tar.xz
+/qtwebview-opensource-src-5.8.0.tar.xz
diff --git a/qt5-qtwebview.spec b/qt5-qtwebview.spec
index 3378862..37f6e72 100644
--- a/qt5-qtwebview.spec
+++ b/qt5-qtwebview.spec
@@ -1,33 +1,27 @@
 %global qt_module qtwebview
 
-# no docs
-#global docs 1
-# consider enabling
-#global examples 1
+# To build without qttools doctools package, just undefine docs
+%ifarch %{arm} %{ix86} x86_64
+%global docs 1
+%endif
 
 Summary: Qt5 - WebView component
 Name:    qt5-%{qt_module}
-Version: 5.7.1
-Release: 3%{?dist}
+Version: 5.8.0
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://www.qt.io
-Source0: http://download.qt.io/official_releases/qt/5.7/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
-
-# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
-%{?qt5_qtwebengine_arches:ExclusiveArch: %{qt5_qtwebengine_arches}}
-
-BuildRequires: qt5-qtbase-devel >= %{version}
-BuildRequires: qt5-qtdeclarative-devel >= %{version}
-BuildRequires: qt5-qtwebengine-devel >= %{version}
+Source0: http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 
-%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+BuildRequires: pkgconfig(Qt5Core) >= %{version}
+BuildRequires: pkgconfig(Qt5Quick) >= %{version}
+BuildRequires: pkgconfig(Qt5WebEngine) >= %{version}
 
 %description
-Qt WebView provides a way to display web content in a QML application
-without necessarily including a full web browser stack by using native
-APIs where it makes sense.
+Qt WebView provides a way to display web content in a QML application without necessarily
+including a full web browser stack by using native APIs where it makes sense.
 
 %package devel
 Summary: Development files for %{name}
@@ -37,17 +31,20 @@ Requires: qt5-qtdeclarative-devel%{?_isa}
 %description devel
 %{summary}.
 
-%if 0%{?docs}
 %package doc
 Summary: API documentation for %{name}
 License: GFDL
 Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
+BuildRequires: qt5-doctools
+BuildRequires: qt5-qtbase-doc
+BuildRequires: qt5-qtdeclarative-doc
+BuildRequires: qt5-qtwebengine-doc
+Requires: qt5-qtbase-doc
+Requires: qt5-qtdeclarative-doc
+Requires: qt5-qtwebengine-doc
 BuildArch: noarch
 %description doc
 %{summary}.
-%endif
 
 %package examples
 Summary: Programming examples for %{name}
@@ -68,6 +65,10 @@ pushd %{_target_platform}
 
 make %{?_smp_mflags}
 
+%if 0%{?docs}
+make %{?_smp_mflags} docs
+%endif
+
 %install
 make install INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
@@ -106,13 +107,9 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 %{_qt5_examplesdir}/
 %endif
 
-
 %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
-
-* Thu Feb 02 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-2
-- ExclusiveArch: %%{qt5_qtwebengine_arches}
+* Mon Mar 13 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-1
+- New upstream version
 
 * Thu Nov 10 2016 Helio Chissini de Castro <helio@kde.org> - 5.7.1-1
 - First package
diff --git a/sources b/sources
index e204857..f33722b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtwebview-opensource-src-5.7.1.tar.xz) = c0b45e9c157e442ba6621add9fb8df36be996ffe676ddaac219cccfeb80e1211eccef06fd0c5267cef4b22585d6cf90afd6880e9f6f09c3ae9c66afc6eae37fc
+SHA512 (qtwebview-opensource-src-5.8.0.tar.xz) = 5d7e376f0ed3f8112aa9393b6bebf39f527734cc612e3021caddc369374d07a113833599ed1bc302033810f23a80ebdda4b4ed62c9f7cc7b0d273d3db18df407