diff --git a/.gitignore b/.gitignore
index a6d9cf4..3d2d31c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /qtx11extras-opensource-src-5.7.1.tar.xz
+/qtx11extras-opensource-src-5.8.0.tar.xz
diff --git a/qt5-qtx11extras.spec b/qt5-qtx11extras.spec
index c48bd81..04151ca 100644
--- a/qt5-qtx11extras.spec
+++ b/qt5-qtx11extras.spec
@@ -1,20 +1,21 @@
-
 %global qt_module qtx11extras
 
-%define docs 1
+# To build without qttools doctools package, just undefine docs
+%ifarch %{arm} %{ix86} x86_64
+%global docs 1
+%endif
 
 Summary: Qt5 - X11 support library
 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
+Source0: http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/%{qt_module}-opensource-src-%{version}.tar.xz
 
 BuildRequires: qt5-qtbase-devel >= %{version}
-
 BuildRequires: qt5-qtbase-private-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 
@@ -34,8 +35,8 @@ Requires: qt5-qtbase-devel%{?_isa}
 %package doc
 Summary: API documentation for %{name}
 Requires: %{name} = %{version}-%{release}
-BuildRequires: qt5-qdoc
-BuildRequires: qt5-qhelpgenerator
+BuildRequires: qt5-doctools
+BuildRequires: qt5-qtbase-doc
 BuildArch: noarch
 %description doc
 %{summary}.
@@ -101,8 +102,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
+* Fri Jan 27 2017 Helio Chissini de Castro <helio@kde.org> - 5.8.0-1
+- New upstream release
 
 * 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 173c71f..b915ae2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtx11extras-opensource-src-5.7.1.tar.xz) = 04359d85fad3dd51d6364c5218d5f76a384ec0d2082cefc7c67c5a8899cb19df3c9ce750b6707acfecf0a5ea57fb8cb737e5a8d2af3c63345f167f24712aaaee
+SHA512 (qtx11extras-opensource-src-5.8.0.tar.xz) = c52d7b936cd3a44c0775a78f07e64f2718594d8a9cb76c5163725469fcafe634983e5855d7dd690f8210a6c22e58f8b635f09ca80396811858e79c2f8b7a5db7