diff --git a/.gitignore b/.gitignore
index d386ed5..034831c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /qtvirtualkeyboard-opensource-src-5.7.0.tar.xz
 /qtvirtualkeyboard-opensource-src-5.7.1.tar.xz
+/qtvirtualkeyboard-opensource-src-5.8.0.tar.xz
diff --git a/qt5-qtvirtualkeyboard.spec b/qt5-qtvirtualkeyboard.spec
index 93fb362..f91f490 100644
--- a/qt5-qtvirtualkeyboard.spec
+++ b/qt5-qtvirtualkeyboard.spec
@@ -1,41 +1,49 @@
-
 %global qt_module qtvirtualkeyboard
 
-%define docs 1
+# To build without qttools doctools package, just undefine docs
+%ifarch %{arm} %{ix86} x86_64
+%global docs 1
+%endif
 
 Summary: Qt5 - VirtualKeyboard component
 Name:    qt5-%{qt_module}
-Version: 5.7.1
-Release: 4%{?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-qtdeclarative-devel >= %{version}
 BuildRequires: qt5-qtsvg-devel >= %{version}
 
-Obsoletes: qt5-qtvirtualkeyboard-devel < 5.7.1-4
-Provides:  qt5-qtvirtualkeyboard-devel = %{version}-%{release}
-
-# version unknown
-Provides: bundled(libpinyin)
-
 %description
 The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend
 for Qt 5 on Linux Desktop/X11, Windows Desktop, and Boot2Qt targets.
 The input framework makes it easy to write custom input methods or to
 integrate 3rd party input engines. The input methods can be implemented in C++ or QML.
 
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: qt5-qtbase-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-qtsvg-doc
+Requires: qt5-qtbase-doc
+Requires: qt5-qtdeclarative-doc
+Requires: qt5-qtsvg-doc
 BuildArch: noarch
 %description doc
 %{summary}.
@@ -56,7 +64,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 mkdir %{_target_platform}
 pushd %{_target_platform}
 %{qmake_qt5} .. \
-  CONFIG+=lang-all
+  %{?_qt5_examplesdir:CONFIG+=qt_example_installs}
 
 make %{?_smp_mflags}
 
@@ -82,28 +90,25 @@ make install_docs INSTALL_ROOT=%{buildroot} -C %{_target_platform}
 
 %files
 %license LICENSE.GPL3
-%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QVirtualKeyboardPlugin.cmake
 %{_qt5_plugindir}/platforminputcontexts/libqtvirtualkeyboardplugin.so
 %{_qt5_qmldir}/QtQuick/VirtualKeyboard
-%{_qt5_datadir}/qtvirtualkeyboard/
+
+%files devel
+%{_qt5_libdir}/cmake/Qt5Gui/Qt5Gui_QVirtualKeyboardPlugin.cmake
 
 %if 0%{?docs}
 %files doc
 %{_qt5_docdir}/qtvirtualkeyboard.qch
 %{_qt5_docdir}/qtvirtualkeyboard/
-%endif
 
 %files examples
 %{_qt5_examplesdir}/
+%endif
 
 
 %changelog
-* Fri Mar 03 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-4
-- %%build: CONFIG+=lang-all, drop -devel (*Plugin.cmake can go in main)
-- Provides: bundled(libpinyin)
-
-* 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 17 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.7.1-2
 - updated sources, drop pkgconfig-style deps (for now)
diff --git a/sources b/sources
index d417d1a..72daad9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (qtvirtualkeyboard-opensource-src-5.7.1.tar.xz) = 31481a88b91ef936437e54c863d39a63917496bd5701670ed38f1695c7cc6d867b8cc0eede62a523d5fea3819bc2688845277c9737349a0982de711cc464f00f
+SHA512 (qtvirtualkeyboard-opensource-src-5.8.0.tar.xz) = 119ed8d475da4be4dbfdcb6b9ebd30c2337ef3db80470e027034c67832236ba9a70140c5c5c329d0e603b487d253a3d792797d7d8fb864d9e5091ab43b881b74