diff --git a/qt5-qtlocation.spec b/qt5-qtlocation.spec
index 1d55693..7c93ea5 100644
--- a/qt5-qtlocation.spec
+++ b/qt5-qtlocation.spec
@@ -1,14 +1,23 @@
 
 %global qt_module qtlocation
+
 # define to build docs, need to undef this for bootstrapping
+# where qt5-qttools builds are not yet available
+# only primary archs (for now), allow secondary to bootstrap
+#global bootstrap 1
+
+%if ! 0%{?bootstrap}
+%ifarch %{arm} %{ix86} x86_64
 %define docs 1
+%endif
+%endif
 
 #define prerelease rc
 
 Summary: Qt5 - Location component
 Name:    qt5-%{qt_module}
 Version: 5.5.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -47,8 +56,7 @@ Requires: qt5-qtbase-devel%{?_isa}
 %package doc
 Summary: API documentation for %{name}
 Requires: %{name} = %{version}-%{release}
-# for qhelpgenerator
-BuildRequires: qt5-qttools-devel
+BuildRequires: qt5-qhelpgenerator
 BuildArch: noarch
 %description doc
 %{summary}.
@@ -147,6 +155,9 @@ popd
 
 
 %changelog
+* Wed Jul 29 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-3
+- -docs: BuildRequires: qt5-qhelpgenerator, standardize bootstrapping
+
 * Thu Jul 16 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-2
 - tighten qtbase dep (#1233829), .spec cosmetics, (re)enable docs