diff --git a/.gear/cmake.spec b/.gear/cmake.spec
index 9d7020f..1669b62 100644
--- a/.gear/cmake.spec
+++ b/.gear/cmake.spec
@@ -1,8 +1,9 @@
 %set_verify_elf_method unresolved=strict
 %def_without check
+
 Name: cmake
 Version: 3.6.3
-Release: alt0.1
+Release: alt0.1.1
 
 Summary: Cross-platform, open-source make system
 
@@ -18,10 +19,10 @@ Source2: CMakeCache.txt
 Patch: %name-%version-%release.patch
 
 BuildRequires: bzlib-devel gcc-c++ libarchive-devel >= 2.8.4
-BuildRequires: libcurl-devel libexpat-devel libncurses-devel qt5-base-devel libxml2-devel
-BuildRequires: liblzma-devel jsoncpp-devel doxygen graphviz zlib-devel
-BuildRequires: python-module-sphinx-devel
+BuildRequires: libcurl-devel libexpat-devel libncurses-devel libxml2-devel
+BuildRequires: liblzma-devel graphviz zlib-devel
 BuildRequires: shared-mime-info rpm-build-vim
+%{?!_with_bootstrap:BuildRequires: python-module-sphinx-devel qt5-base-devel jsoncpp-devel doxygen}
 %{?!_without_check:%{?!_disable_check:BuildRequires: /proc gcc-fortran java-devel cvs subversion mercurial git-core}}
 
 Obsoletes: cpack < 2.4.5-alt3
@@ -30,7 +31,7 @@ Provides: cpack = %version-%release
 Requires: %name-modules = %version-%release
 Requires: rpm-macros-%name = %version-%release
 
-%define _unpackaged_files_terminate_build 1
+%{?!_with_bootstrap:%define _unpackaged_files_terminate_build 1}
 
 %add_findreq_skiplist %_datadir/CMake/Templates/cygwin-package.sh.in
 
@@ -135,15 +136,20 @@ Set of RPM macros for packaging applications that use cmake.
 %build
 mkdir build
 pushd build
-install -m644 %SOURCE2 ./
+install -pm644 %SOURCE2 ./
 
 CFLAGS="%optflags" CXXFLAGS="%optflags" ../bootstrap \
 	--verbose \
 	--parallel=%__nprocs \
 	--system-libs \
+%if_with bootstrap
+	--no-system-jsoncpp \
+%else
+	--system-jsoncpp \
 	--qt-gui \
 	--sphinx-man \
 	--sphinx-html \
+%endif
 	--prefix=%prefix \
 	--datadir=/share/CMake \
 	--mandir=/share/man \
@@ -151,14 +157,21 @@ CFLAGS="%optflags" CXXFLAGS="%optflags" ../bootstrap \
 
 
 export LD_LIBRARY_PATH=$PWD/Source:$PWD/Source/kwsys/:$PWD/Source/CursesDialog/form
+#if_with bootstrap
+#make -j1 VERBOSE=1
+#else
 %make_build VERBOSE=1
+#endif
 popd
 
 
 %install
 pushd build
 export LD_LIBRARY_PATH=$PWD/Source:$PWD/Source/kwsys/:$PWD/Source/CursesDialog/form
-%makeinstall_std
+%if_with bootstrap
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$PWD/Utilities/cmjsoncpp:$PWD/Utilities/cmcompress
+%endif
+%makeinstall_std -j1
 popd
 #install -m644 ChangeLog.manual %buildroot%_docdir/%name-%version
 mv %buildroot/usr/lib %buildroot%_libdir || :
@@ -175,6 +188,10 @@ mv -f %buildroot%_datadir/CMake/completions %buildroot%_sysconfdir/bash_completi
 install -p  build/Source/kwsys/libcmsys.so  %buildroot%_libdir/libcmsys.so
 install -p  build/Source/kwsys/libcmsys_c.so  %buildroot%_libdir/libcmsys_c.so
 
+%if_with bootstrap
+install -p  build/Utilities/cmjsoncpp/libcmjsoncpp.so %buildroot%_libdir/libcmjsoncpp.so
+%endif
+
 %check
 %if_with check
 # CTest.UpdateGIT fails, see #20884
@@ -196,11 +213,15 @@ popd
 %_libdir/libcmcompress.so
 %_libdir/libcmsys.so
 %_libdir/libcmsys_c.so
-%_datadir/CMake/
-%_aclocaldir/*
+%if_with bootstrap
+%_libdir/libcmjsoncpp.so
+%else
 %_man1dir/cmake*.*
 %_man1dir/cpack.*
 %_man7dir/*
+%endif
+%_datadir/CMake/
+%_aclocaldir/*
 %dir %_docdir/%name-%version/
 #_docdir/%name-%version/ChangeLog.manual
 %_docdir/%name-%version/Copyright.txt
@@ -216,15 +237,17 @@ popd
 %files -n ccmake
 %_bindir/ccmake
 #_libdir/libcmForm.so
-%_man1dir/ccmake.*
+%{?!_with_bootstrap:%_man1dir/ccmake.*}
 
 
 %files -n ctest
 %_bindir/ctest
 %_libdir/libCTestLib.so
-%_man1dir/ctest.*
+%{?!_with_bootstrap:%_man1dir/ctest.*}
 
 
+%if_with bootstrap
+%else
 %files gui
 %_bindir/cmake-gui
 %_desktopdir/CMake.desktop
@@ -240,6 +263,7 @@ popd
 #_docdir/%name-%version/cpack*
 #_docdir/%name-%version/ctest.*
 %_docdir/%name-%version/html
+%endif
 
 
 %files -n vim-plugin-%name
@@ -255,6 +279,9 @@ popd
 %filter_from_requires /^gnustep-Backbone.*/d
 
 %changelog
+* Fri Jan 13 2017 Michael Shigorin <mike@altlinux.org> 3.6.3-alt0.1.1
+- BOOTSTRAP: drop hairy BRs if requested to, adjust build appropriately.
+
 * Tue Dec 13 2016 L.A. Kostis <lakostis@altlinux.ru> 3.6.3-alt0.1
 - Updated to 3.6.3.
 - .spec cleanup for new rpm.