diff --git a/base/acl/acl.SMBuild b/base/acl/acl.SMBuild
index b169fd5..5ba5329 100755
--- a/base/acl/acl.SMBuild
+++ b/base/acl/acl.SMBuild
@@ -1,6 +1,6 @@
 app=acl
 version=2.2.53
-build=1sml
+build=2sml
 homepage="http://savannah.nongnu.org/projects/acl"
 download="https://download.savannah.nongnu.org/releases/acl/acl-$version.tar.gz"
 requires="attr"
@@ -17,14 +17,12 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" 
+    --prefix="" \
+    --docdir="/share/doc/$app-$version" 
 
   make
   make install DESTDIR=$pkg
 
-  mv $pkg/share/doc/$app/* $pkgdocs/
-  rm -rf $pkg/share/doc
-
   mkfinalpkg
 }
 
diff --git a/base/bash/bash.SMBuild b/base/bash/bash.SMBuild
index b65635c..912dc10 100755
--- a/base/bash/bash.SMBuild
+++ b/base/bash/bash.SMBuild
@@ -1,6 +1,6 @@
 app=bash
 version=5.0
-build=1sml
+build=2sml
 homepage="https://www.gnu.org/software/bash/bash.html"
 download="https://ftp.gnu.org/gnu/bash/bash-$version.tar.gz"
 requires="netbsd-curses"
@@ -23,6 +23,7 @@ build() {
   ./configure \
     --prefix="" \
     --bindir=/bin \
+    --docdir="/share/doc/$app-$version" \
     --without-bash-malloc \
     --disable-rpath \
     --enable-history \
diff --git a/base/bison/bison.SMBuild b/base/bison/bison.SMBuild
index 87169da..986e576 100755
--- a/base/bison/bison.SMBuild
+++ b/base/bison/bison.SMBuild
@@ -1,6 +1,6 @@
 app=bison
 version=3.1
-build=1sml
+build=2sml
 homepage="https://www.gnu.org/software/bison/bison.html"
 download="https://ftp.gnu.org/gnu/bison/bison-$version.tar.xz"
 desc="parser generator similar to yacc"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-nls 
 
   make
diff --git a/base/cmake/cmake.SMBuild b/base/cmake/cmake.SMBuild
index 4d45a0d..2d1d660 100755
--- a/base/cmake/cmake.SMBuild
+++ b/base/cmake/cmake.SMBuild
@@ -1,6 +1,6 @@
 app=cmake
 version=3.17.3
-build=1sml
+build=2sml
 homepage="http://www.cmake.org"
 download="https://cmake.org/files/v$version/cmake-$version.tar.gz"
 desc="Cross-platform, open-source make system"
@@ -20,6 +20,7 @@ build() {
 
   ./bootstrap \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --no-system-curl \
     --no-system-expat \
     --no-system-jsoncpp \
@@ -32,7 +33,7 @@ build() {
   make
   make install DESTDIR=$pkg
 
-  cp Licenses/* Copyright.txt $pkgdocs/
+  cp Licenses/* Copyright.txt $pkgdocs/ 
 
   mkfinalpkg
 }
diff --git a/base/dosfstools/dosfstools.SMBuild b/base/dosfstools/dosfstools.SMBuild
index 375316d..c6468f6 100755
--- a/base/dosfstools/dosfstools.SMBuild
+++ b/base/dosfstools/dosfstools.SMBuild
@@ -1,6 +1,6 @@
 app=dosfstools
 version=4.1
-build=1sml
+build=2sml
 homepage="https://github.com/dosfstools/dosfstools"
 download="https://github.com/dosfstools/dosfstools/releases/download/v$version/dosfstools-$version.tar.gz"
 desc="Tools for working with FAT filesystems"
@@ -20,6 +20,7 @@ build() {
   ./configure \
     --prefix="" \
     --sbindir=/bin \
+    --docdir="/share/doc/$app-$version" \
     --enable-compat-symlinks
 
   make
diff --git a/base/expat/expat.SMBuild b/base/expat/expat.SMBuild
index f2b8b55..e74f5ba 100755
--- a/base/expat/expat.SMBuild
+++ b/base/expat/expat.SMBuild
@@ -1,8 +1,8 @@
 app=expat
 version=2.5.0
+build=2sml
 homepage="https://downloads.sourceforge.net/project/expat/"
 download="https://downloads.sourceforge.net/project/expat/expat/$version/expat-$version.tar.bz2"
-build=1sml
 desc="C library for parsing XML"
 requires="musl"
 
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/base/flac/flac.SMBuild b/base/flac/flac.SMBuild
index 327b85b..4bfee35 100755
--- a/base/flac/flac.SMBuild
+++ b/base/flac/flac.SMBuild
@@ -16,7 +16,6 @@ prepbuilddir() {
 }
 
 build() {
-
   if [[ $arch == "aarch64" ]] ; then
     sseopts="--disable-sse" 
   else
@@ -25,6 +24,7 @@ build() {
 
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     $sseopts
 
   make
diff --git a/base/flex/flex.SMBuild b/base/flex/flex.SMBuild
index aaa1225..1d89e26 100755
--- a/base/flex/flex.SMBuild
+++ b/base/flex/flex.SMBuild
@@ -1,6 +1,6 @@
 app=flex
 version=2.6.4
-build=1sml
+build=2sml
 homepage="https://github.com/westes/flex"
 download="https://github.com/westes/flex/archive/refs/tags/v$version.tar.gz"
 desc="fast lexical analyzer generator"
@@ -19,14 +19,13 @@ build() {
   CPPFLAGS="$CFLAGS -DSTDC_HEADERS" \
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-nls \
     --disable-static 
 
   make
   make install DESTDIR=$pkg
 
-  cp COPYING $pkgdocs/
-
   mkfinalpkg
 }
 
diff --git a/base/gettext/gettext.SMBuild b/base/gettext/gettext.SMBuild
index 01cdda0..c0b6703 100755
--- a/base/gettext/gettext.SMBuild
+++ b/base/gettext/gettext.SMBuild
@@ -1,6 +1,6 @@
 app=gettext
 version=0.21.1
-build=1sml
+build=2sml
 homepage="https://www.gnu.org/software/gettext/"
 download="https://ftp.gnu.org/pub/gnu/gettext/gettext-$version.tar.xz"
 desc="Toolkit to internationalize messages given by shell scripts"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static \
     --disable-java
 
diff --git a/base/gnupg2/gnupg2.SMBuild b/base/gnupg2/gnupg2.SMBuild
index 99cd2d4..0198195 100755
--- a/base/gnupg2/gnupg2.SMBuild
+++ b/base/gnupg2/gnupg2.SMBuild
@@ -1,6 +1,6 @@
 app=gnupg2
 version=2.2.20
-build=1sml
+build=2sml
 homepage="https://gnupg.org/"
 download="https://gnupg.org/ftp/gcrypt/gnupg/gnupg-$version.tar.bz2"
 desc="The GNU Privacy Guard version 2.x"
@@ -18,7 +18,8 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
-    --sbindir=/bin 
+    --sbindir=/bin \
+    --docdir="/share/doc/$app-$version"
 
   make
   make install DESTDIR=$pkg 
diff --git a/base/highlight/highlight.SMBuild b/base/highlight/highlight.SMBuild
index a9aa76b..45661c9 100755
--- a/base/highlight/highlight.SMBuild
+++ b/base/highlight/highlight.SMBuild
@@ -1,6 +1,6 @@
 app=highlight
 version=4.0
-build=1sml
+build=2sml
 homepage="http://www.andre-simon.de/doku/highlight/en/highlight.php"
 download="http://www.andre-simon.de/zip/highlight-$version.tar.bz2"
 desc="Universal syntax highlighter"
@@ -17,7 +17,7 @@ prepbuilddir() {
 
 build() {
   make 
-  make install PREFIX="/" DESTDIR=$pkg
+  make install PREFIX="/" doc_dir="/share/doc/$app-$version" DESTDIR=$pkg
 
   cp COPYING $pkgdocs/
 
diff --git a/base/lame/lame.SMBuild b/base/lame/lame.SMBuild
index 2024751..e5116c6 100755
--- a/base/lame/lame.SMBuild
+++ b/base/lame/lame.SMBuild
@@ -19,6 +19,7 @@ build() {
   LIBS="-lcurses -lterminfo" \
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --enable-shared \
     --enable-nasm \
     --disable-static
diff --git a/base/libatasmart/libatasmart.SMBuild b/base/libatasmart/libatasmart.SMBuild
index 037b0c4..0a35aff 100755
--- a/base/libatasmart/libatasmart.SMBuild
+++ b/base/libatasmart/libatasmart.SMBuild
@@ -1,6 +1,6 @@
 app=libatasmart
 version=0.19
-build=1sml
+build=2sml
 homepage="http://0pointer.de/blog/projects/being-smart.html"
 download="https://0pointer.de/public/libatasmart-$version.tar.xz"
 desc="ATA S.M.A.R.T reading and parsing library"
@@ -19,6 +19,7 @@ build() {
   ./configure \
     --prefix="" \
     --sbindir=/bin \
+    --docdir="/share/doc/$app-$version" \
     --disable-static \
     $builddist
 
diff --git a/base/libdaemon/libdaemon.SMBuild b/base/libdaemon/libdaemon.SMBuild
index 3cad242..fd0fd4b 100755
--- a/base/libdaemon/libdaemon.SMBuild
+++ b/base/libdaemon/libdaemon.SMBuild
@@ -20,6 +20,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static \
     $builddist
 
diff --git a/base/libexif/libexif.SMBuild b/base/libexif/libexif.SMBuild
index 844f45f..73847a4 100755
--- a/base/libexif/libexif.SMBuild
+++ b/base/libexif/libexif.SMBuild
@@ -1,7 +1,7 @@
 app=libexif
 version=0.6.22
 mversion="(echo $version | sed 's@_@.)"
-build=1sml
+build=2sml
 homepage="https://libexif.github.io/"
 download="https://github.com/libexif/libexif/releases/download/libexif-$mversion-release/libexif-$version.tar.xz"
 desc="Exchangeable Image File Format library"
@@ -19,13 +19,12 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
   make install DESTDIR=$pkg
 
-  cp COPYING $pkgdocs/
- 
   mkfinalpkg
 }
 
diff --git a/base/libgc/libgc.SMBuild b/base/libgc/libgc.SMBuild
index 43b9f16..b9dbf8c 100755
--- a/base/libgc/libgc.SMBuild
+++ b/base/libgc/libgc.SMBuild
@@ -1,6 +1,6 @@
 app=libgc
 version=8.0.4
-build=1sml
+build=2sml
 homepage="https://www.hboehm.info/gc/"
 download="https://www.hboehm.info/gc/gc_source/gc-$version.tar.gz"
 desc="Conservative garbage collector for C and C++"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --enable-cplusplus \
     --enable-threads=pthreads \
     --disable-static \
diff --git a/base/libjpeg-turbo/libjpeg-turbo.SMBuild b/base/libjpeg-turbo/libjpeg-turbo.SMBuild
index 1912b6f..0877866 100755
--- a/base/libjpeg-turbo/libjpeg-turbo.SMBuild
+++ b/base/libjpeg-turbo/libjpeg-turbo.SMBuild
@@ -1,6 +1,6 @@
 app=libjpeg-turbo
 version=2.0.4
-build=1sml
+build=2sml
 homepage="https://github.com/libjpeg-turbo/libjpeg-turbo"
 desc="JPEG library on steroids"
 requires="nasm"
@@ -19,6 +19,7 @@ build() {
   cmake .. \
     -DCMAKE_INSTALL_PREFIX="" \
     -DCMAKE_INSTALL_LIBDIR="/lib" \
+    -DCMAKE_INSTALL_DOCDIR="/share/doc/$app-$version" \
     -DENABLE_STATIC=OFF
 
   make
diff --git a/base/libkate/libkate.SMBuild b/base/libkate/libkate.SMBuild
index 791deac..c75d801 100755
--- a/base/libkate/libkate.SMBuild
+++ b/base/libkate/libkate.SMBuild
@@ -1,6 +1,6 @@
 app=libkate
 version=0.4.1
-build=1sml
+build=2sml
 homepage="https://wiki.xiph.org/OggKate"
 desc="Codec providing karaoke and text support in Ogg"
 requires="libogg libpng python3"
@@ -23,13 +23,12 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make
   make install DESTDIR=$pkg 
 
-  cp COPYING $pkgdocs/
-
   mkfinalpkg
 }
 
diff --git a/base/libogg/libogg.SMBuild b/base/libogg/libogg.SMBuild
index a3a3522..498e005 100755
--- a/base/libogg/libogg.SMBuild
+++ b/base/libogg/libogg.SMBuild
@@ -1,6 +1,6 @@
 app=libogg
 version=1.3.4
-build=1sml
+build=2sml
 homepage="https://xiph.org/ogg/"
 desc="Library for manipulating ogg bitstreams"
 requires="musl"
@@ -17,6 +17,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/base/libunistring/libunistring.SMBuild b/base/libunistring/libunistring.SMBuild
index 8964e43..a446a31 100755
--- a/base/libunistring/libunistring.SMBuild
+++ b/base/libunistring/libunistring.SMBuild
@@ -1,6 +1,6 @@
 app=libunistring
 version=0.9.10
-build=1sml
+build=2sml
 homepage="http://www.gnu.org/s/libunistring"
 download="https://ftp.gnu.org/gnu/libunistring/libunistring-$version.tar.gz"
 desc="GNU Unicode string manipulating library"
@@ -19,6 +19,7 @@ build() {
 
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static \
     --disable-rpath
 
diff --git a/base/lzo/lzo.SMBuild b/base/lzo/lzo.SMBuild
index 27bbf23..24457fa 100755
--- a/base/lzo/lzo.SMBuild
+++ b/base/lzo/lzo.SMBuild
@@ -1,6 +1,6 @@
 app=lzo
 version=2.10
-build=1sml
+build=2sml
 homepage="http://www.oberhumer.com/opensource/lzo/"
 download="http://www.oberhumer.com/opensource/lzo/download/lzo-$version.tar.gz"
 desc="portable lossless data compression library written in ANSI C"
@@ -18,14 +18,13 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --enable-shared=yes \
     --enable-static=no 
 
   make
   make install DESTDIR=$pkg
 
-  cp COPYING $pkgdocs/
-
   mkfinalpkg
 }
 
diff --git a/base/mpfr/mpfr.SMBuild b/base/mpfr/mpfr.SMBuild
index 2456502..ae6b6de 100755
--- a/base/mpfr/mpfr.SMBuild
+++ b/base/mpfr/mpfr.SMBuild
@@ -1,6 +1,6 @@
 app=mpfr
 version=3.1.6
-build=1sml
+build=2sml
 homepage="https://www.mpfr.org/"
 download="https://ftp.gnu.org/gnu/mpfr/mpfr-$version.tar.xz"
 desc="Multiple-Precision Floating-Point Reliable Library"
@@ -18,13 +18,12 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make 
   make install DESTDIR=$pkg
 
-  cp COPYING* $pkgdocs/
-
   mkfinalpkg
 }
 
diff --git a/base/nano/nano.SMBuild b/base/nano/nano.SMBuild
index ab9f33f..b80943a 100755
--- a/base/nano/nano.SMBuild
+++ b/base/nano/nano.SMBuild
@@ -1,6 +1,6 @@
 app=nano
 version=3.2
-build=1sml
+build=2sml
 homepage="http://www.nano-editor.org"
 download="https://www.nano-editor.org/dist/v3/nano-$version.tar.xz"
 desc="Nano's ANOther editor, an enhanced free Pico clone"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-nls 
 
   make
diff --git a/base/openssl/openssl.SMBuild b/base/openssl/openssl.SMBuild
index cd85e38..e76bc9e 100755
--- a/base/openssl/openssl.SMBuild
+++ b/base/openssl/openssl.SMBuild
@@ -1,6 +1,6 @@
 app=openssl
 version=1.1.1t
-build=1sml
+build=2sml
 homepage="https://www.openssl.org/"
 download="https://www.openssl.org/source/openssl-$version.tar.gz"
 desc="Commercial-grade, full-featured crypto library from OpenSSL Project that implements TLS 1.x protocol"
@@ -28,7 +28,7 @@ build() {
      shared enable-md2 no-weak-ssl-ciphers
 
   make
-  make install LIBDIR=lib DESTDIR=$pkg
+  make install LIBDIR=lib DOCDIR="/share/doc/$app-$version" DESTDIR=$pkg
 
   cp LICENSE $pkgdocs/
 
diff --git a/base/opusfile/opusfile.SMBuild b/base/opusfile/opusfile.SMBuild
index 9663f3d..d1556fa 100755
--- a/base/opusfile/opusfile.SMBuild
+++ b/base/opusfile/opusfile.SMBuild
@@ -1,6 +1,6 @@
 app=opusfile
 version=0.11
-build=1sml
+build=2sml
 homepage="https://opus-codec.org/"
 download="https://downloads.xiph.org/releases/opus/opusfile-$version.tar.gz"
 desc="dependency for the opus audio library"
@@ -18,13 +18,12 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
   make install DESTDIR=$pkg
 
-  cp COPYING $pkgdocs/
-
   mkfinalpkg
 }
 
diff --git a/base/readline/readline.SMBuild b/base/readline/readline.SMBuild
index 63d3c79..744a296 100755
--- a/base/readline/readline.SMBuild
+++ b/base/readline/readline.SMBuild
@@ -1,6 +1,6 @@
 app=readline
 version=6.3
-build=1sml
+build=2sml
 homepage="https://tiswww.case.edu/php/chet/readline/rltop.html"
 download="ftp://ftp.cwru.edu/pub/bash/readline-$version.tar.gz"
 desc="Line input library with editing features"
@@ -22,6 +22,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --with-curses \
     --enable-multibyte \
     --disable-static 
@@ -29,8 +30,6 @@ build() {
   make shared
   make install DESTDIR=$pkg
 
-  cp COPYING $pkgdocs/
-
   mkfinalpkg
 }
 
diff --git a/base/signify/signify.SMBuild b/base/signify/signify.SMBuild
index 0c51592..b445fce 100755
--- a/base/signify/signify.SMBuild
+++ b/base/signify/signify.SMBuild
@@ -1,6 +1,6 @@
 app=signify
 version=30
-build=1sml
+build=2sml
 libbsdversion=0.10.0
 homepage="https://github.com/aperezdc/signify"
 download="https://github.com/aperezdc/signify/releases/download/v$version/signify-$version.tar.xz"
@@ -39,6 +39,8 @@ build() {
    CFLAGS="-I$LIBBSDPATH/include" LDFLAGS="-L$LIBBSDPATH/lib"
   make install PREFIX="" DESTDIR=$pkg
 
+  cp COPYING $pkgdocs/
+
   mkfinalpkg
 }
 
diff --git a/base/speexdsp/speexdsp.SMBuild b/base/speexdsp/speexdsp.SMBuild
index b96340b..ef9dccb 100755
--- a/base/speexdsp/speexdsp.SMBuild
+++ b/base/speexdsp/speexdsp.SMBuild
@@ -1,6 +1,6 @@
 app=speexdsp
 version=1.2.0
-build=1sml
+build=2sml
 homepage="http://www.speex.org/"
 desc="Patent-free open-source DSP library"
 requires="musl"
@@ -17,13 +17,13 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
+    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make
   make install DESTDIR=$pkg 
 
-  cp COPYING ChangeLog $pkgdocs/
+  cp COPYING $pkgdocs/
 
   mkfinalpkg
 }
diff --git a/base/sudo/sudo.SMBuild b/base/sudo/sudo.SMBuild
index dc16f2b..0989daf 100755
--- a/base/sudo/sudo.SMBuild
+++ b/base/sudo/sudo.SMBuild
@@ -1,6 +1,6 @@
 app=sudo
 version=1.9.12p2
-build=1sml
+build=2sml
 homepage="https://www.sudo.ws/"
 download="https://www.sudo.ws/dist/sudo-$version.tar.gz"
 desc="give limited root privileges to certain users"
@@ -21,6 +21,7 @@ build() {
     --prefix="" \
     --sysconfdir=/etc \
     --sbindir=/bin \
+    --docdir="/share/doc/$app-$version" \
     --with-env-editor \
     --disable-pam-session \
     --without-pam \
diff --git a/base/toluapp/toluapp.SMBuild b/base/toluapp/toluapp.SMBuild
index 51b2312..7fff30f 100755
--- a/base/toluapp/toluapp.SMBuild
+++ b/base/toluapp/toluapp.SMBuild
@@ -1,6 +1,6 @@
 app=toluapp
 version=1.0.93
-build=1sml
+build=2sml
 homepage="https://github.com/LuaDist/toluapp"
 download="https://github.com/LuaDist/toluapp/archive/refs/tags/$version.tar.gz"
 desc="tool to integrate C/C++ code with Lua"
@@ -19,11 +19,14 @@ build() {
   mkdir -p smbuild && cd smbuild
   cmake .. \
     -DCMAKE_INSTALL_PREFIX="" \
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_BUILD_TYPE=Release \
+    -DINSTALL_DOC="/share/doc/$app-$version"
 
   make
   make install DESTDIR=$pkg 
 
+  rm -r $pkg/share/$app
+
   cp ../README* $pkgdocs/
 
   mkfinalpkg
diff --git a/base/twolame/twolame.SMBuild b/base/twolame/twolame.SMBuild
index 1fb5fec..611cd97 100755
--- a/base/twolame/twolame.SMBuild
+++ b/base/twolame/twolame.SMBuild
@@ -1,6 +1,6 @@
 app=twolame
 version=0.4.0
-build=1sml
+build=2sml
 homepage="https://www.twolame.org/"
 download="https://downloads.sourceforge.net/twolame/twolame-$version.tar.gz"
 desc="Optimised MP2 audio encoder"
@@ -18,13 +18,12 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make
   make install DESTDIR=$pkg 
 
-  cp COPYING $pkgdocs/
-
   mkfinalpkg
 }
 
diff --git a/base/xz/xz.SMBuild b/base/xz/xz.SMBuild
index 11ddf5d..8a997f9 100755
--- a/base/xz/xz.SMBuild
+++ b/base/xz/xz.SMBuild
@@ -1,6 +1,6 @@
 app=xz
 version=5.2.5
-build=1sml
+build=2sml
 homepage="https://tukaani.org/xz/"
 download="https://tukaani.org/xz/xz-$version.tar.xz"
 desc="Compression utility based on the LZMA algorithm"
@@ -19,6 +19,7 @@ build() {
   ./configure \
     --prefix="" \
     --bindir=/bin \
+    --docdir="/share/doc/$app-$version" \
     --disable-nls \
     --enable-static \
     --with-pic 
@@ -26,8 +27,6 @@ build() {
   make
   make install DESTDIR=$pkg
 
-  cp COPYING* $pkgdocs/
-
   mkfinalpkg
 }
 
diff --git a/extra/cmus/cmus.SMBuild b/extra/cmus/cmus.SMBuild
index 53765aa..58d2925 100755
--- a/extra/cmus/cmus.SMBuild
+++ b/extra/cmus/cmus.SMBuild
@@ -1,6 +1,6 @@
 app=cmus
 version=2.8.0
-build=1sml
+build=2sml
 homepage="https://cmus.github.io/"
 download="https://github.com/cmus/cmus/archive/v$version.tar.gz"
 desc="Fast text-mode music player"
@@ -18,8 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     prefix="" \
-    exampledir="/doc/$app-$version/examples" \
-  DEBUG=0
+    exampledir="/share/doc/$app-$version/examples"
 
   make
   make install DESTDIR=$pkg 
diff --git a/extra/feh/README b/extra/feh/README
deleted file mode 100644
index c467cb8..0000000
--- a/extra/feh/README
+++ /dev/null
@@ -1,6 +0,0 @@
-feh is an image viewer at heart, though it does other cool stuff.
-feh features include simple image viewing, multiple image viewing
-(slideshow), multiple image viewing in multiwindows, image viewing
-in fullscreen, image list mode, loadable/unloadable listing,
-recursive file opening, saving/loading filelists, loading images
-via http, reloading after delay, montage creation, and more.
diff --git a/extra/feh/feh.SMBuild b/extra/feh/feh.SMBuild
index a820413..82c43d5 100755
--- a/extra/feh/feh.SMBuild
+++ b/extra/feh/feh.SMBuild
@@ -16,9 +16,12 @@ prepbuilddir() {
 }
 
 build() {
-  CFLAGS+=" -include string.h" \
-  make PREFIX="/" exif=1 help=1
-  make install DESTDIR=$pkg PREFIX="/" man_dir=$pkg/share/man 
+  CFLAGS+=" -include string.h" make PREFIX="/" exif=1 help=1 
+  make install DESTDIR=$pkg \
+    PREFIX="/" \
+    man_dir=$pkg/share/man \
+    example_dir="$pkg/share/doc/$app-$version/examples" \
+    doc_dir="$pkg/share/doc/$app-$version"
 
   cp COPYING $pkgdocs/
 
diff --git a/extra/ffmpeg/ffmpeg.SMBuild b/extra/ffmpeg/ffmpeg.SMBuild
index e157006..83f8e3a 100755
--- a/extra/ffmpeg/ffmpeg.SMBuild
+++ b/extra/ffmpeg/ffmpeg.SMBuild
@@ -1,6 +1,6 @@
 app=ffmpeg
 version=4.3
-build=2sml
+build=3sml
 homepage="https://ffmpeg.org/"
 download="https://ffmpeg.org/releases/ffmpeg-$version.tar.xz"
 desc="Software to record, convert and stream audio and video"
@@ -17,11 +17,12 @@ prepbuilddir() {
 
 build() {
   ./configure \
-    --prefix="" \
+    --prefix="/" \
     --bindir=/bin \
     --incdir=/include \
     --libdir=/lib \
-    --docdir=/share \
+    --docdir="/share/doc/$app-$version" \
+    --datadir="/share/doc/$app-$version" \
     --mandir=/share/man \
     --enable-shared \
     --disable-static \
@@ -52,14 +53,11 @@ build() {
     --enable-libopenjpeg \
     --enable-libcdio 
   
-  # For some reason ffmpeg's make does not pick up MAKEFLAGS from the env
-  make $MAKEFLAGS
+  make
   make install DESTDIR=$pkg 
 
   cp LICENSE.md COPYING* $pkgdocs/
 
-  [[ -d $pkg/usr/local/share/$app ]] && rm -r $pkg/usr
- 
   mkfinalpkg
 }
 
diff --git a/extra/imagemagick/imagemagick.SMBuild b/extra/imagemagick/imagemagick.SMBuild
index bfb3aa9..64ab50e 100755
--- a/extra/imagemagick/imagemagick.SMBuild
+++ b/extra/imagemagick/imagemagick.SMBuild
@@ -1,6 +1,6 @@
 app=imagemagick
 version=7.1.0
-build=1sml
+build=2sml
 homepage="https://www.imagemagick.org/"
 download=""
 desc="Robust collection of image processing tools"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --without-modules \
     --with-x \
     --with-frozenpaths=no \
@@ -26,13 +27,11 @@ build() {
     --enable-shared
 
   make
-  make install DESTDIR=$pkg
-
-  cp LICENSE $pkgdocs/
+  make install DOCUMENTATION_PATH="/share/doc/$app-$version" DESTDIR=$pkg
 
   mkfinalpkg
 }
 
 sha512sums="
-a86a745a1b693ed825bd167e8c2f9333e188c903cd0beb3295aba537aab022de50fe7b1d92756ea32ed19684806e694c8e3dd3f5cc79fb653338220739aad260  ImageMagick-7.0.8-14.tar.lz
+9ccd022d3403cd3a1457cb37104e3a804f94c67271847cb85b5b9084d287da77fb348d6f543bb9922c95d00c8865f55018d3e2cd947ccf0e68d335657c8d9841  ImageMagick-7.1.0-62.tar.lz
 "
diff --git a/xorg/libice/libice.SMBuild b/xorg/libice/libice.SMBuild
index 4159965..24b7c5d 100755
--- a/xorg/libice/libice.SMBuild
+++ b/xorg/libice/libice.SMBuild
@@ -1,6 +1,6 @@
 app=libice
 version=1.0.10
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://xorg.freedesktop.org/releases/individual/lib/libICE-$version.tar.bz2"
 desc="X11 Inter-Client Exchange library"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make
diff --git a/xorg/libsm/libsm.SMBuild b/xorg/libsm/libsm.SMBuild
index e487753..a301894 100755
--- a/xorg/libsm/libsm.SMBuild
+++ b/xorg/libsm/libsm.SMBuild
@@ -1,6 +1,6 @@
 app=libsm
 version=1.2.3
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://xorg.freedesktop.org/releases/individual/lib/libSM-$version.tar.gz"
 desc="X11 Session Management library"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make
diff --git a/xorg/libx11/libx11.SMBuild b/xorg/libx11/libx11.SMBuild
index 8f40f55..cd9c37d 100755
--- a/xorg/libx11/libx11.SMBuild
+++ b/xorg/libx11/libx11.SMBuild
@@ -1,6 +1,6 @@
 app=libx11
 version=1.8.2
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://www.x.org/releases/individual/lib/libX11-$version.tar.xz"
 desc="X11 client-side library"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/xorg/libxaw/libxaw.SMBuild b/xorg/libxaw/libxaw.SMBuild
index c0207fe..760f92a 100755
--- a/xorg/libxaw/libxaw.SMBuild
+++ b/xorg/libxaw/libxaw.SMBuild
@@ -1,6 +1,6 @@
 app=libxaw
 version=1.0.13
-build=1sml
+build=1l2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://www.x.org/releases/individual/lib/libXaw-$version.tar.bz2"
 desc="X11 Athena Widget library"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/xorg/libxaw3d/libxaw3d.SMBuild b/xorg/libxaw3d/libxaw3d.SMBuild
index 50ab03a..790f662 100755
--- a/xorg/libxaw3d/libxaw3d.SMBuild
+++ b/xorg/libxaw3d/libxaw3d.SMBuild
@@ -1,6 +1,6 @@
 app=libxaw3d
 version=1.6.3
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://www.x.org/releases/individual/lib/libXaw3d-$version.tar.bz2"
 desc="Three-D Athena widgets"
@@ -18,7 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
-    --sysconfdir=/etc \
+    --docdir="/share/doc/$app-$version" \
     --disable-static \
     $builddist
 
diff --git a/xorg/libxaw3dxft/libxaw3dxft.SMBuild b/xorg/libxaw3dxft/libxaw3dxft.SMBuild
index 580ca7b..d564045 100755
--- a/xorg/libxaw3dxft/libxaw3dxft.SMBuild
+++ b/xorg/libxaw3dxft/libxaw3dxft.SMBuild
@@ -1,6 +1,6 @@
 app=libxaw3dxft
 version=1.6.2d
-build=1sml
+build=2sml
 homepage="http://sourceforge.net/projects/sf-xpaint/files/libxaw3dxft/"
 download="https://sourceforge.net/projects/sf-xpaint/files/libxaw3dxft/libXaw3dXft-$version.tar.bz2"
 desc="xaw3d library for xpaint"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/xorg/libxdmcp/libxdmcp.SMBuild b/xorg/libxdmcp/libxdmcp.SMBuild
index 44ba6be..a007e7a 100755
--- a/xorg/libxdmcp/libxdmcp.SMBuild
+++ b/xorg/libxdmcp/libxdmcp.SMBuild
@@ -1,6 +1,6 @@
 app=libxdmcp
 version=1.1.3
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://www.x.org/releases/individual/lib/libXdmcp-$version.tar.bz2"
 desc="X11 Display Manager Control Protocol library"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/xorg/libxext/libxext.SMBuild b/xorg/libxext/libxext.SMBuild
index 9e754a4..29e5260 100755
--- a/xorg/libxext/libxext.SMBuild
+++ b/xorg/libxext/libxext.SMBuild
@@ -1,6 +1,6 @@
 app=libxext
 version=1.3.4
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://www.x.org/releases/individual/lib/libXext-$version.tar.bz2"
 desc="X11 miscellaneous extensions library"
@@ -19,6 +19,7 @@ build() {
   ac_cv_func__XEatDataWords=yes \
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/xorg/libxi/libxi.SMBuild b/xorg/libxi/libxi.SMBuild
index 7ba530b..3473d18 100755
--- a/xorg/libxi/libxi.SMBuild
+++ b/xorg/libxi/libxi.SMBuild
@@ -1,6 +1,6 @@
 app=libxi
 version=1.7.10
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://www.x.org/releases/individual/lib/libXi-$version.tar.bz2"
 desc="X11 Input extension library"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/xorg/libxmu/libxmu.SMBuild b/xorg/libxmu/libxmu.SMBuild
index 5cf905e..01e895b 100755
--- a/xorg/libxmu/libxmu.SMBuild
+++ b/xorg/libxmu/libxmu.SMBuild
@@ -1,6 +1,6 @@
 app=libxmu
 version=1.1.3
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://www.x.org/releases/individual/lib/libXmu-$version.tar.bz2"
 desc="X11 miscellaneous micro-utility library"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/xorg/libxrender/libxrender.SMBuild b/xorg/libxrender/libxrender.SMBuild
index 1ae7875..3d5b9f7 100755
--- a/xorg/libxrender/libxrender.SMBuild
+++ b/xorg/libxrender/libxrender.SMBuild
@@ -1,6 +1,6 @@
 app=libxrender
 version=0.9.10
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://www.x.org/releases/individual/lib/libXrender-$version.tar.bz2"
 desc="X Rendering Extension client library"
@@ -19,6 +19,7 @@ build() {
   CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" \
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/xorg/libxt/libxt.SMBuild b/xorg/libxt/libxt.SMBuild
index 90fbd11..45ca7d0 100755
--- a/xorg/libxt/libxt.SMBuild
+++ b/xorg/libxt/libxt.SMBuild
@@ -1,6 +1,6 @@
 app=libxt
 version=1.2.0
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://www.x.org/releases/individual/lib/libXt-$version.tar.bz2"
 desc="X11 toolkit intrinsics library"
@@ -18,6 +18,7 @@ prepbuilddir() {
 build() {
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static 
 
   make
diff --git a/xorg/libxtst/libxtst.SMBuild b/xorg/libxtst/libxtst.SMBuild
index 96d8edd..c05124d 100755
--- a/xorg/libxtst/libxtst.SMBuild
+++ b/xorg/libxtst/libxtst.SMBuild
@@ -1,6 +1,6 @@
 app=libxtst
 version=1.2.3
-build=1sml
+build=2sml
 homepage="https://xorg.freedesktop.org/"
 download="https://www.x.org/releases/individual/lib/libXtst-$version.tar.bz2"
 desc="X11 Testing -- Resource extension library"
@@ -19,6 +19,7 @@ build() {
   CFLAGS="$CFLAGS -DHAVE__XEATDATAWORDS=1" \
   ./configure \
     --prefix="" \
+    --docdir="/share/doc/$app-$version" \
     --disable-static
 
   make