diff --git a/PKGBUILD b/PKGBUILD
index 03bb4e3..79b0bc4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,25 +33,20 @@ prepare() {
 }
 
 build() {
-  CFLAGS+=' -fPIC'
-  CXXFLAGS+=' -fPIC'
-  export CFLAGS CXXFLAGS
-  
   USE_SYSTEM_LIBS='yes'
   export USE_SYSTEM_LIBS
 
-  export CFLAGS+=' -ffat-lto-objects'
-
   cd $pkgbase-${pkgver/_/}-source
-  make build=release libs apps
+  make shared=yes build=release libs apps
 }
 
 package_libmupdf() {
   pkgdesc='Library for Lightweight PDF and XPS viewer'
+  depends=('freetype2' 'gumbo-parser' 'harfbuzz' 'jbig2dec' 'libjpeg' 'openjpeg2')
 
   cd $pkgbase-${pkgver/_/}-source
 
-  make build=release prefix="$pkgdir"/usr install
+  make shared=yes build=release prefix="$pkgdir"/usr install
 
   rm -rf "$pkgdir"/usr/{bin,share/man}
   mv "$pkgdir"/usr/share/doc/mupdf "$pkgdir"/usr/share/doc/libmupdf
@@ -62,12 +57,11 @@ package_libmupdf() {
 
 package_mupdf() {
   pkgdesc='Lightweight PDF and XPS viewer'
-  depends=('desktop-file-utils' 'freetype2' 'harfbuzz' 'jbig2dec'
-           'libjpeg' 'openjpeg2' 'openssl' 'libxext' 'gumbo-parser')
+  depends=('desktop-file-utils' 'libmupdf' 'openssl' 'libxext')
 
   cd $pkgbase-${pkgver/_/}-source
 
-  install -D -m0755 build/release/mupdf-x11 "$pkgdir"/usr/bin/mupdf
+  install -D -m0755 build/shared-release/mupdf-x11 "$pkgdir"/usr/bin/mupdf
 
   install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
 
@@ -82,12 +76,11 @@ package_mupdf-gl() {
   pkgdesc='Lightweight PDF and XPS viewer with OpenGL backend'
   conflicts=('mupdf')
   provides=("mupdf=${pkgver}")
-  depends=('desktop-file-utils' 'freetype2' 'freeglut' 'glu' 'harfbuzz' 'jbig2dec'
-           'libjpeg' 'openjpeg2' 'openssl' 'gumbo-parser')
+  depends=('desktop-file-utils' 'freeglut' 'glu' 'libmupdf' 'openssl')
 
   cd $pkgbase-${pkgver/_/}-source
 
-  install -D -m0755 build/release/mupdf-gl "$pkgdir"/usr/bin/mupdf
+  install -D -m0755 build/shared-release/mupdf-gl "$pkgdir"/usr/bin/mupdf
 
   install -D -m0644 docs/man/mupdf.1 "$pkgdir"/usr/share/man/man1/mupdf.1
 
@@ -100,14 +93,12 @@ package_mupdf-gl() {
 
 package_mupdf-tools() {
   pkgdesc='Tools for Lightweight PDF and XPS viewer'
-  depends=('mupdf')
-  depends=('freetype2' 'jbig2dec' 'libjpeg' 'openjpeg2' 'harfbuzz' 'openssl'
-           'gumbo-parser')
+  depends=('libmupdf' 'openssl')
 
   cd $pkgbase-${pkgver/_/}-source
 
-  install -D -m0755 build/release/mutool "$pkgdir"/usr/bin/mutool
-  install -D -m0755 build/release/muraster "$pkgdir"/usr/bin/muraster
+  install -D -m0755 build/shared-release/mutool "$pkgdir"/usr/bin/mutool
+  install -D -m0755 build/shared-release/muraster "$pkgdir"/usr/bin/muraster
 
   install -D -m0644 docs/man/mutool.1 "$pkgdir"/usr/share/man/man1/mutool.1