diff --git a/.gitignore b/.gitignore
index 3fc64b0..3350f52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qt3d-opensource-src-5.7.1.tar.xz
+/qt3d-opensource-src-5.8.0.tar.xz
diff --git a/qt5-qt3d.spec b/qt5-qt3d.spec
index a1ab6c9..5534620 100644
--- a/qt5-qt3d.spec
+++ b/qt5-qt3d.spec
@@ -1,17 +1,20 @@
 %global qt_module qt3d
 
-%define docs 1
+# To build without qttools doctools package, just undefine docs
+%ifarch %{arm} %{ix86} x86_64
+%global docs 1
+%endif
 
 Summary: Qt5 - Qt3D QML bindings and C++ APIs
 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://www.qt.io
-Source0: http://download.qt.io/official_releases/qt/5.7/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
+Source0: http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 
 BuildRequires:  qt5-qtbase-static >= %{version}
 BuildRequires:  pkgconfig(Qt5Quick)
@@ -40,8 +43,13 @@ 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
+BuildRequires: qt5-qtxmlpatterns-doc
+BuildRequires: qt5-qtdeclarative-doc
+Requires: qt5-qtbase-doc
+Requires: qt5-declarative-doc
+Requires: qt5-qtxmlpatterns-doc
 BuildArch: noarch
 %description doc
 %{summary}.
@@ -172,8 +180,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
+* Mon Jan 30 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-1
+- New upstream version
 
 * Sat Dec 10 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-2
 - 5.7.1 dec5 snapshot
diff --git a/sources b/sources
index c3b5850..6deedb6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-99f01224fbd41ff307f2a8f4cb5eaeaf  qt3d-opensource-src-5.7.1.tar.xz
+SHA512 (qt3d-opensource-src-5.8.0.tar.xz) = 95018edcda0528ce67733d87f67f471ff80f69ef4a91a1837f9b02dac4de3cd8744c00b237d94addc776b6a39a70afa0f94570ee6b7220d4510cc36d96dd0c3f