diff --git a/README.rst b/README.rst
index 7ad0d4145173fcc34ec9af3ce6ba266a6d561e11..af54abada5f6ddb8fc8b67e81e76195f6100e050 100644
--- a/README.rst
+++ b/README.rst
@@ -112,6 +112,12 @@ To install archiso system-wide use the included **Makefile**:
 
     make install
 
+Optionally install archiso's mkinitcpio hooks:
+
+  .. code:: bash
+
+    make install-initcpio
+
 License
 =======
 
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 79cd34e1a5d7b628b46dc4350f77a6cc5ac8e0a4..c0b170472fef31a0b0a17380b5a7d168224c1c6d 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -56,11 +56,6 @@ make_custom_airootfs() {
              done < "${_airootfs}/etc/passwd"
         fi
     fi
-
-    mkdir -p -- "${work_dir}/airootfs/etc/initcpio/hooks"
-    mkdir -p -- "${work_dir}/airootfs/etc/initcpio/install"
-    cp /usr/lib/initcpio/hooks/archiso "${work_dir}/airootfs/etc/initcpio/hooks/"
-    cp /usr/lib/initcpio/install/archiso "${work_dir}/airootfs/etc/initcpio/install/"
 }
 
 # Packages (airootfs)
diff --git a/configs/baseline/packages.x86_64 b/configs/baseline/packages.x86_64
index 14fe5f0ea453090f3e4ed9f1af3373bf5669f43f..fd753b42262d3556b1b76be412e98d30c1f7c95a 100644
--- a/configs/baseline/packages.x86_64
+++ b/configs/baseline/packages.x86_64
@@ -3,4 +3,5 @@
 base
 linux
 mkinitcpio
+mkinitcpio-archiso
 syslinux
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 888c06138aac8d907fae6d9bd6c59dbe418cb10d..7f0eb67444ad35188e0ef4491ca5947baab1d946 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -86,17 +86,6 @@ make_custom_airootfs() {
              done < "${_airootfs}/etc/passwd"
         fi
     fi
-
-    local _hook
-    mkdir -p -- "${work_dir}/x86_64/airootfs/etc/initcpio/hooks"
-    mkdir -p -- "${work_dir}/x86_64/airootfs/etc/initcpio/install"
-    for _hook in archiso archiso_shutdown archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_loop_mnt; do
-        cp "/usr/lib/initcpio/hooks/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/hooks/"
-        cp "/usr/lib/initcpio/install/${_hook}" "${work_dir}/x86_64/airootfs/etc/initcpio/install/"
-    done
-    sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${work_dir}/x86_64/airootfs/etc/initcpio/install/archiso_shutdown"
-    cp /usr/lib/initcpio/install/archiso_kms "${work_dir}/x86_64/airootfs/etc/initcpio/install/"
-    cp /usr/lib/initcpio/archiso_shutdown "${work_dir}/x86_64/airootfs/etc/initcpio/"
 }
 
 # Packages (airootfs)
diff --git a/configs/releng/packages.x86_64 b/configs/releng/packages.x86_64
index 2c73b8e5b67f6965c164f68dab79435bccb8baea..f5e7e9f6e34cee413982cc714bd4d0072240fefc 100644
--- a/configs/releng/packages.x86_64
+++ b/configs/releng/packages.x86_64
@@ -48,6 +48,7 @@ mc
 mdadm
 memtest86+
 mkinitcpio
+mkinitcpio-archiso
 mkinitcpio-nfs-utils
 mtools
 nano