diff --git a/src/flit-core/.gitignore b/src/m4/.gitignore
similarity index 100%
rename from src/flit-core/.gitignore
rename to src/m4/.gitignore
diff --git a/src/m4/changes.md b/src/m4/changes.md
new file mode 100644
index 0000000..2fe028d
--- /dev/null
+++ b/src/m4/changes.md
@@ -0,0 +1,2 @@
+# 1.4.19
+First version
diff --git a/src/m4/pkg.sh b/src/m4/pkg.sh
new file mode 100644
index 0000000..81a99c0
--- /dev/null
+++ b/src/m4/pkg.sh
@@ -0,0 +1,23 @@
+# general info
+NAME="m4"
+DESC="Implementation of the traditional Unix macro processor"
+VERSION="1.4.19"
+
+# required files
+FILES=("https://ftp.gnu.org/gnu/m4/m4-${VERSION}.tar.xz")
+HASHES=("0d90823e1426f1da2fd872df0311298d")
+
+# install and build depends
+DEPENDS=("bash" "glibc")
+BUILD=()
+
+build(){
+  tar xf "${NAME}-${VERSION}.tar.xz"
+  cd "${NAME}-${VERSION}"
+
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${ROOTDIR}" install
+
+  cd .. && rm -r "${NAME}-${VERSION}"
+}
diff --git a/src/jinja2/.gitignore b/src/make-ca/.gitignore
similarity index 100%
rename from src/jinja2/.gitignore
rename to src/make-ca/.gitignore
diff --git a/src/make-ca/changes.md b/src/make-ca/changes.md
new file mode 100644
index 0000000..9a1e896
--- /dev/null
+++ b/src/make-ca/changes.md
@@ -0,0 +1,2 @@
+# 1.14
+First version
diff --git a/src/make-ca/pkg.sh b/src/make-ca/pkg.sh
new file mode 100644
index 0000000..f060f6d
--- /dev/null
+++ b/src/make-ca/pkg.sh
@@ -0,0 +1,29 @@
+# general info
+NAME="make-ca"
+DESC="PKI setup script for LFS (and others)"
+VERSION="1.14"
+
+# required files
+FILES=(
+  "https://github.com/lfs-book/make-ca/archive/refs/tags/v${VERSION}.tar.gz"
+  "https://anduin.linuxfromscratch.org/BLFS/other/certdata.txt"
+)
+HASHES=(
+  "6391698fe6db16eb190da1aba802bc90c09c8baa4c116d9c65647bea87f190db"
+  "4c933cfd2327b2a381542f3cb6392179d5e359811f5274734e8dc7e28e587b61"
+)
+
+# install and build depends
+DEPENDS=("p11-kit" "libtasn1")
+BUILD=()
+
+build(){
+  tar xf "v${VERSION}.tar.gz"
+  cd "${NAME}-${VERSION}"
+
+  make DESTDIR="${ROOTDIR}" install
+  install -vdm755 "${ROOTDIR}/etc/ssl/local"
+  install -m644 "${ROOTDIR}/certdata.txt" "${ROOTDIR}/etc/ssl"
+
+  cd .. && rm -r "${NAME}-${VERSION}"
+}
diff --git a/src/make/.gitignore b/src/make/.gitignore
new file mode 100644
index 0000000..8b56c9f
--- /dev/null
+++ b/src/make/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+dist/
+root/
diff --git a/src/make/changes.md b/src/make/changes.md
new file mode 100644
index 0000000..bf6a681
--- /dev/null
+++ b/src/make/changes.md
@@ -0,0 +1,2 @@
+# 4.4.1
+First version
diff --git a/src/make/pkg.sh b/src/make/pkg.sh
new file mode 100644
index 0000000..5f274d5
--- /dev/null
+++ b/src/make/pkg.sh
@@ -0,0 +1,23 @@
+# general info
+NAME="make"
+DESC="Controls the generation of executables and other non-source files"
+VERSION="4.4.1"
+
+# required files
+FILES=("https://ftp.gnu.org/gnu/make/make-${VERSION}.tar.gz")
+HASHES=("c8469a3713cbbe04d955d4ae4be23eeb")
+
+# install and build depends
+DEPENDS=("glibc")
+BUILD=()
+
+build(){
+  tar xf "${NAME}-${VERSION}.tar.gz"
+  cd "${NAME}-${VERSION}"
+
+  ./configure --prefix=/usr
+  make
+  make DESTDIR="${ROOTDIR}" install
+
+  cd .. && rm -r "${NAME}-${VERSION}"
+}
diff --git a/src/man-db/.gitignore b/src/man-db/.gitignore
new file mode 100644
index 0000000..8b56c9f
--- /dev/null
+++ b/src/man-db/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+dist/
+root/
diff --git a/src/man-db/changes.md b/src/man-db/changes.md
new file mode 100644
index 0000000..988f24f
--- /dev/null
+++ b/src/man-db/changes.md
@@ -0,0 +1,2 @@
+# 2.12.1
+First version
diff --git a/src/man-db/pkg.sh b/src/man-db/pkg.sh
new file mode 100644
index 0000000..d388689
--- /dev/null
+++ b/src/man-db/pkg.sh
@@ -0,0 +1,34 @@
+# general info
+NAME="man-db"
+DESC="Tools for reading manual pages"
+VERSION="2.12.1"
+
+# required files
+FILES=("https://download-mirror.savannah.gnu.org/releases/man-db/man-db-${VERSION}.tar.xz")
+HASHES=("0f79f4205ce116c3148dc6caf561c1b7d793aac234188ef8edd1b1f5aaaebcca32c65ef403dff65896920535077fb63ddc2e9cb293efdb6ef3037c33916aa329")
+
+# install and build depends
+DEPENDS=(
+  "bash" "gdbm" "zlib"
+  "groff" "libpipeline" "less"
+  "libseccomp" "glibc" "gzip"
+)
+BUILD=()
+
+build(){
+  tar xf "${NAME}-${VERSION}.tar.xz"
+  cd "${NAME}-${VERSION}"
+
+  ./configure --prefix=/usr                             \
+            --docdir="/usr/share/doc/man-db-${VERSION}" \
+            --sysconfdir=/etc                           \
+            --disable-setuid                            \
+            --enable-cache-owner=bin                    \
+            --with-browser=/usr/bin/lynx                \
+            --with-vgrind=/usr/bin/vgrind               \
+            --with-grap=/usr/bin/grap
+  make
+  make DESTDIR="${ROOTDIR}" install
+
+  cd .. && rm -r "${NAME}-${VERSION}"
+}
diff --git a/src/man-pages/.gitignore b/src/man-pages/.gitignore
new file mode 100644
index 0000000..8b56c9f
--- /dev/null
+++ b/src/man-pages/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+dist/
+root/
diff --git a/src/man-pages/changes.md b/src/man-pages/changes.md
new file mode 100644
index 0000000..6fba404
--- /dev/null
+++ b/src/man-pages/changes.md
@@ -0,0 +1,2 @@
+# 6.9.1
+First version
diff --git a/src/man-pages/pkg.sh b/src/man-pages/pkg.sh
new file mode 100644
index 0000000..a0792e9
--- /dev/null
+++ b/src/man-pages/pkg.sh
@@ -0,0 +1,35 @@
+# general info
+NAME="man-pages"
+DESC="Manual pages for Linux kernel and C library interfaces"
+VERSION="6.9.1"
+
+# required files
+FILES=(
+  "https://www.kernel.org/pub/linux/docs/man-pages/man-pages-${VERSION}.tar.xz"
+  "https://www.kernel.org/pub/linux/docs/man-pages/man-pages-posix/man-pages-posix-2017-a.tar.xz"
+)
+HASHES=(
+  "e23cbac29f110ba571f0da8523e79d373691466ed7f2a31301721817d34530bd"
+  "ce67bb25b5048b20dad772e405a83f4bc70faf051afa289361c81f9660318bc3"
+)
+
+# install and build depends
+DEPENDS=()
+BUILD=()
+
+build(){
+  tar xf "${NAME}-${VERSION}.tar.xz"
+  tar xf "${NAME}-posix-2017-a.tar.xz"
+  
+  pushd "${NAME}-${VERSION}"
+    rm -v man3/crypt*
+    make DESTDIR="${ROOTDIR}" prefix=/usr install
+  popd
+
+  pushd "${NAME}-posix-2017"
+    make DESTDIR="${ROOTDIR}" prefix=/usr install
+  popd
+
+  rm -r "${NAME}-${VERSION}"
+  rm -r "${NAME}-posix-2017"
+}
diff --git a/src/mandoc/.gitignore b/src/mandoc/.gitignore
new file mode 100644
index 0000000..8b56c9f
--- /dev/null
+++ b/src/mandoc/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+dist/
+root/
diff --git a/src/mandoc/changes.md b/src/mandoc/changes.md
new file mode 100644
index 0000000..c6ac772
--- /dev/null
+++ b/src/mandoc/changes.md
@@ -0,0 +1,2 @@
+# 1.14.6
+First version
diff --git a/src/mandoc/pkg.sh b/src/mandoc/pkg.sh
new file mode 100644
index 0000000..c6deca1
--- /dev/null
+++ b/src/mandoc/pkg.sh
@@ -0,0 +1,28 @@
+# general info
+NAME="mandoc"
+DESC="UNIX manpage compiler toolset"
+VERSION="1.14.6"
+
+# required files
+FILES=("https://mandoc.bsd.lv/snapshots/mandoc-${VERSION}.tar.gz")
+HASHES=("f0adf24e8fdef5f3e332191f653e422a")
+
+# install and build depends
+DEPENDS=("zlib" "less")
+BUILD=()
+
+build(){
+  tar xf "${NAME}-${VERSION}.tar.gz"
+  cd "${NAME}-${VERSION}"
+
+  ./configure
+  make mandoc
+
+  install -dm755 "${ROOTDIR}/usr/share/man/man1"
+  install -dm755 "${ROOTDIR}/usr/bin"
+
+  install -vm755 mandoc   "${ROOTDIR}/usr/bin"
+  install -vm644 mandoc.1 "${ROOTDIR}/usr/share/man/man1"
+
+  cd .. && rm -r "${NAME}-${VERSION}"
+}
diff --git a/src/meson/.gitignore b/src/meson/.gitignore
new file mode 100644
index 0000000..8b56c9f
--- /dev/null
+++ b/src/meson/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+dist/
+root/
diff --git a/src/meson/changes.md b/src/meson/changes.md
new file mode 100644
index 0000000..ed228b6
--- /dev/null
+++ b/src/meson/changes.md
@@ -0,0 +1,2 @@
+# 1.5.0
+First version
diff --git a/src/meson/pkg.sh b/src/meson/pkg.sh
new file mode 100644
index 0000000..53835d7
--- /dev/null
+++ b/src/meson/pkg.sh
@@ -0,0 +1,25 @@
+# general info
+NAME="meson"
+DESC="Open source build system meant to be both extremely fast and as user friendly as possible"
+VERSION="1.5.0"
+
+# required files
+FILES=("https://github.com/mesonbuild/meson/releases/download/${VERSION}/meson-${VERSION}.tar.gz")
+HASHES=("45d7b8653c1e5139df35b33be2dd5b2d040c5b2c6129f9a7c890d507e33312b8")
+
+# install and build depends
+DEPENDS=("ninja" "python3")
+BUILD=()
+
+build(){
+  tar xf "${NAME}-${VERSION}.tar.gz"
+  cd "${NAME}-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  install -vDm644 data/shell-completions/bash/meson "${ROOTDIR}/usr/share/bash-completion/completions/meson"
+  install -vDm644 data/shell-completions/zsh/_meson "${ROOTDIR}/usr/share/zsh/site-functions/_meson"
+
+  cd .. && rm -r "${NAME}-${VERSION}"
+}
diff --git a/src/nano/.gitignore b/src/nano/.gitignore
new file mode 100644
index 0000000..8b56c9f
--- /dev/null
+++ b/src/nano/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+dist/
+root/
diff --git a/src/nano/changes.md b/src/nano/changes.md
new file mode 100644
index 0000000..af0e3c9
--- /dev/null
+++ b/src/nano/changes.md
@@ -0,0 +1,2 @@
+# 8.1
+First version
diff --git a/src/nano/pkg.sh b/src/nano/pkg.sh
new file mode 100644
index 0000000..6e1ba9e
--- /dev/null
+++ b/src/nano/pkg.sh
@@ -0,0 +1,28 @@
+# general info
+NAME="nano"
+DESC="A small, simple text editor which aims to replace Pico"
+VERSION="8.1"
+
+# required files
+FILES=("https://www.nano-editor.org/dist/v8/nano-${VERSION}.tar.xz")
+HASHES=("93b3e3e9155ae389fe9ccf9cb7ab380eac29602835ba3077b22f64d0f0cbe8cb")
+
+# install and build depends
+DEPENDS=("ncurses" "file" "glibc")
+BUILD=()
+
+build(){
+  tar xf "${NAME}-${VERSION}.tar.xz"
+  cd "${NAME}-${VERSION}"
+
+    ./configure --prefix=/usr \
+            --sysconfdir=/etc \
+            --enable-utf8     \
+            --docdir="/usr/share/doc/nano-${VERSION}"
+  make
+
+  make DESTDIR="${ROOTDIR}" install
+  install -v -m644 doc/{nano.html,sample.nanorc} "${ROOTDIR}/usr/share/doc/nano-${VERSION}"
+
+  cd .. && rm -r "${NAME}-${VERSION}"
+}
diff --git a/src/nettle/.gitignore b/src/nettle/.gitignore
new file mode 100644
index 0000000..8b56c9f
--- /dev/null
+++ b/src/nettle/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+dist/
+root/
diff --git a/src/nettle/changes.md b/src/nettle/changes.md
new file mode 100644
index 0000000..cb8af91
--- /dev/null
+++ b/src/nettle/changes.md
@@ -0,0 +1,2 @@
+# 3.10
+First version
diff --git a/src/nettle/pkg.sh b/src/nettle/pkg.sh
new file mode 100644
index 0000000..2ffe94e
--- /dev/null
+++ b/src/nettle/pkg.sh
@@ -0,0 +1,27 @@
+# general info
+NAME="nettle"
+DESC="A low-level cryptographic library"
+VERSION="3.10"
+
+# required files
+FILES=("https://ftp.gnu.org/gnu/nettle/nettle-${VERSION}.tar.gz")
+HASHES=("b4c518adb174e484cb4acea54118f02380c7133771e7e9beb98a0787194ee47c")
+
+# install and build depends
+DEPENDS=("glibc" "gmp")
+BUILD=()
+
+build(){
+  tar xf "${NAME}-${VERSION}.tar.gz"
+  cd "${NAME}-${VERSION}"
+
+  ./configure --prefix=/usr --disable-static
+  make
+  make DESTDIR="${ROOTDIR}" install
+
+  chmod -v 755 "${ROOTDIR}/usr/lib/lib"{hogweed,nettle}.so
+  install -v -m755 -d "${ROOTDIR}/usr/share/doc/nettle-${VERSION}"
+  install -v -m644 nettle.{html,pdf} "${ROOTDIR}/usr/share/doc/nettle-${VERSION}"
+
+  cd .. && rm -r "${NAME}-${VERSION}"
+}
diff --git a/src/pypi-flit-core/.gitignore b/src/pypi-flit-core/.gitignore
new file mode 100644
index 0000000..8b56c9f
--- /dev/null
+++ b/src/pypi-flit-core/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+dist/
+root/
diff --git a/src/flit-core/changes.md b/src/pypi-flit-core/changes.md
similarity index 100%
rename from src/flit-core/changes.md
rename to src/pypi-flit-core/changes.md
diff --git a/src/flit-core/pkg.sh b/src/pypi-flit-core/pkg.sh
similarity index 96%
rename from src/flit-core/pkg.sh
rename to src/pypi-flit-core/pkg.sh
index 61433c2..6066599 100644
--- a/src/flit-core/pkg.sh
+++ b/src/pypi-flit-core/pkg.sh
@@ -1,5 +1,5 @@
 # general info
-NAME="flit-core"
+NAME="pypi-flit-core"
 DESC="Distribution-building parts of Flit"
 VERSION="3.9.0"
 
diff --git a/src/pypi-jinja2/.gitignore b/src/pypi-jinja2/.gitignore
new file mode 100644
index 0000000..8b56c9f
--- /dev/null
+++ b/src/pypi-jinja2/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+dist/
+root/
diff --git a/src/jinja2/changes.md b/src/pypi-jinja2/changes.md
similarity index 100%
rename from src/jinja2/changes.md
rename to src/pypi-jinja2/changes.md
diff --git a/src/jinja2/pkg.sh b/src/pypi-jinja2/pkg.sh
similarity index 85%
rename from src/jinja2/pkg.sh
rename to src/pypi-jinja2/pkg.sh
index 4cc031f..2d1750a 100644
--- a/src/jinja2/pkg.sh
+++ b/src/pypi-jinja2/pkg.sh
@@ -1,5 +1,5 @@
 # general info
-NAME="jinja2"
+NAME="pypi-jinja2"
 DESC="Fast, expressive, extensible templating engine"
 VERSION="3.1.3"
 
@@ -8,8 +8,8 @@ FILES=("https://pypi.org/packages/source/J/Jinja2/Jinja2-${VERSION}.tar.gz")
 HASHES=("caf5418c851eac59e70a78d9730d4cea")
 
 # install and build depends
-DEPENDS=("python3" "markupsafe")
-BUILD=("flit-core")
+DEPENDS=("python3" "pypi-markupsafe")
+BUILD=("pypi-flit-core")
 
 build(){
   tar xf "Jinja2-${VERSION}.tar.gz"
diff --git a/src/pypi-markupsafe/.gitignore b/src/pypi-markupsafe/.gitignore
new file mode 100644
index 0000000..8b56c9f
--- /dev/null
+++ b/src/pypi-markupsafe/.gitignore
@@ -0,0 +1,3 @@
+.cache/
+dist/
+root/
diff --git a/src/pypi-markupsafe/changes.md b/src/pypi-markupsafe/changes.md
new file mode 100644
index 0000000..71d731f
--- /dev/null
+++ b/src/pypi-markupsafe/changes.md
@@ -0,0 +1,2 @@
+# 2.1.5
+First version
diff --git a/src/pypi-markupsafe/pkg.sh b/src/pypi-markupsafe/pkg.sh
new file mode 100644
index 0000000..7ebd2ba
--- /dev/null
+++ b/src/pypi-markupsafe/pkg.sh
@@ -0,0 +1,22 @@
+# general info
+NAME="pypi-markupsafe"
+DESC="Implements a text object that escapes characters so it is safe to use in HTML and XML"
+VERSION="2.1.5"
+
+# required files
+FILES=("https://pypi.org/packages/source/M/MarkupSafe/MarkupSafe-${VERSION}.tar.gz")
+HASHES=("8fe7227653f2fb9b1ffe7f9f2058998a")
+
+# install and build depends
+DEPENDS=()
+BUILD=()
+
+build(){
+  tar xf "MarkupSafe-${VERSION}.tar.gz"
+  cd "MarkupSafe-${VERSION}"
+
+  python3 -m build --wheel --skip-dependency-check --no-isolation
+  PYTHONPATH=src python3 -m installer --destdir="${ROOTDIR}" dist/*.whl
+
+  cd .. && rm -r "MarkupSafe-${VERSION}"
+}