diff --git a/srcpkgs/cmake/template b/srcpkgs/cmake/template
index 808d69caec6..a3fc64c83a2 100644
--- a/srcpkgs/cmake/template
+++ b/srcpkgs/cmake/template
@@ -1,11 +1,17 @@
 # Template file for 'cmake'
 pkgname=cmake
 version=3.18.2
-revision=1
-build_style=configure
-configure_args="--prefix=/usr --mandir=/share/man --docdir=/share/doc/cmake
- --system-libs --no-system-jsoncpp ${XBPS_MAKEJOBS:+--parallel=$XBPS_MAKEJOBS}"
+revision=2
+build_style=cmake
+configure_args="-DCMAKE_DOC_DIR=/share/doc/cmake
+ -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_USE_SYSTEM_LIBARCHIVE=1
+ -DCMAKE_USE_SYSTEM_CURL=1 -DCMAKE_USE_SYSTEM_ZLIB=1
+ -DCMAKE_USE_SYSTEM_EXPAT=1 -DCMAKE_USE_SYSTEM_BZIP2=1
+ -DCMAKE_USE_SYSTEM_LIBUV=1 -DCMAKE_USE_SYSTEM_LIBRHASH=1
+ -DCMAKE_USE_SYSTEM_LIBLZMA=1 -DKWSYS_LFS_WORKS=1"
 make_check_target=test
+hostmakedepends="cmake-bootstrap gcc-fortran"
 makedepends="expat-devel libarchive-devel libcurl-devel libuv-devel
  ncurses-devel rhash-devel"
 checkdepends="pax pkg-config"
@@ -16,17 +22,6 @@ homepage="https://www.cmake.org"
 distfiles="https://www.cmake.org/files/v${version%.*}/${pkgname}-${version}.tar.gz"
 checksum=5d4e40fc775d3d828c72e5c45906b4d9b59003c9433ff1b36a1cb552bbd51d7e
 
-if [ "$CROSS_BUILD" ]; then
-	# XXX ugly :-)
-	build_style=cmake
-	hostmakedepends="cmake gcc-fortran"
-	configure_args=" -DCMAKE_DOC_DIR=/share/doc/cmake
-	 -DCMAKE_USE_SYSTEM_LIBARCHIVE=1
-	 -DCMAKE_USE_SYSTEM_CURL=1 -DCMAKE_USE_SYSTEM_ZLIB=1
-	 -DCMAKE_USE_SYSTEM_EXPAT=1 -DCMAKE_USE_SYSTEM_BZIP2=1
-	 -DCMAKE_USE_SYSTEM_LIBLZMA=1 -DKWSYS_LFS_WORKS=1"
-fi
-
 post_install() {
 	rm -rf ${DESTDIR}/usr/share/doc/cmake
 	vlicense Copyright.txt