diff --git a/graphite/PKGBUILD b/graphite/PKGBUILD
index 239e001cbf..72c51e75d9 100644
--- a/graphite/PKGBUILD
+++ b/graphite/PKGBUILD
@@ -1,9 +1,10 @@
 # POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
-pkgname=graphite
+pkgbase=graphite
+pkgname=(graphite graphite-docs)
 pkgver=1.3.14
-pkgrel=2
+pkgrel=3
 epoch=1
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://github.com/silnrsi/graphite"
@@ -14,42 +15,50 @@ makedepends=('cmake' 'freetype2' 'python'
              # for documentation
              'doxygen' 'dblatex' 'graphviz' 'asciidoc')
 checkdepends=('python-fonttools')
-options=('!emptydirs')
 # https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.sha256sum
 source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
 sha256sums=('f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d')
 
-
 build() {
-  mkdir build
-  cd build
-  cmake -G "Unix Makefiles" ../graphite2-${pkgver} \
-	-DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DCMAKE_BUILD_TYPE:STRING=Release \
-	-DGRAPHITE2_COMPARE_RENDERER=OFF \
+  local cmake_options=(
+    -DCMAKE_BUILD_TYPE=None
+    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_SKIP_INSTALL_RPATH=ON
+    -DGRAPHITE2_COMPARE_RENDERER=OFF
+    -DGRAPHITE2_VM_TYPE=direct
+  )
 
-  # fix unwanted -O3 cflag (taken form Debian)
-  find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 's/\-O3//g' {} \;
-
-  make 
-  make -j1 docs
+  cmake -S graphite2-${pkgver} -B build "${cmake_options[@]}"
+  cmake --build build
+  cmake --build build -t docs -j1
 }
 
 check() {
-  cd "${srcdir}"/build
-  ctest || true
+  cd build
+  ctest --output-on-failure --stop-on-failure -j$(nproc)
 }
 
-package() {
-  cd "${srcdir}"/build
-  make DESTDIR="$pkgdir/" install
-  # install doc files
-  mkdir -p "${pkgdir}"/usr/share/doc/graphite2/api
-  cp -vrf doc/doxygen/{html,latex/refman.pdf} "${pkgdir}"/usr/share/doc/graphite2/api
-  cp -vrf doc/{GTF,manual}.html "${pkgdir}"/usr/share/doc/graphite2
+package_graphite() {
+  optdepends=('graphite-docs: Documentation')
+  provides=('libgraphite2.so')
+
+  DESTDIR="$pkgdir" cmake --install build
 
   # licenses
-  mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
+  install -Dm644 graphite2-${pkgver}/COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
+
+package_graphite-docs() {
+  pkgdesc+=" (documentation)"
+  depends=()
+
+  local docdir="${pkgdir}/usr/share/doc/${pkgbase}"
+  mkdir -p "${docdir}/api"
+  cp -vrf build/doc/doxygen/{html,latex/refman.pdf} "${docdir}/api"
+  cp -vrf build/doc/{GTF,manual}.html "${docdir}"
+
+  # licenses
+  install -Dm644 graphite2-${pkgver}/COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+# vim:set sw=2 sts=-1 et: