diff --git a/os-prober/.footprint b/os-prober/.footprint
new file mode 100644
index 000000000..82dfb7d41
--- /dev/null
+++ b/os-prober/.footprint
@@ -0,0 +1,40 @@
+drwxr-xr-x	root/root	usr/
+drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/linux-boot-prober
+-rwxr-xr-x	root/root	usr/bin/os-prober
+drwxr-xr-x	root/root	usr/lib/
+drwxr-xr-x	root/root	usr/lib/linux-boot-probes/
+-rwxr-xr-x	root/root	usr/lib/linux-boot-probes/50mounted-tests
+drwxr-xr-x	root/root	usr/lib/linux-boot-probes/mounted/
+-rwxr-xr-x	root/root	usr/lib/linux-boot-probes/mounted/40grub
+-rwxr-xr-x	root/root	usr/lib/linux-boot-probes/mounted/40grub2
+-rwxr-xr-x	root/root	usr/lib/linux-boot-probes/mounted/50lilo
+-rwxr-xr-x	root/root	usr/lib/linux-boot-probes/mounted/90fallback
+drwxr-xr-x	root/root	usr/lib/os-prober/
+-rwxr-xr-x	root/root	usr/lib/os-prober/newns
+drwxr-xr-x	root/root	usr/lib/os-probes/
+-rwxr-xr-x	root/root	usr/lib/os-probes/50mounted-tests
+drwxr-xr-x	root/root	usr/lib/os-probes/init/
+-rwxr-xr-x	root/root	usr/lib/os-probes/init/10filesystems
+drwxr-xr-x	root/root	usr/lib/os-probes/mounted/
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/05efi
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/10freedos
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/10qnx
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/20macosx
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/20microsoft
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/30utility
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/40lsb
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/70hurd
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/80minix
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/83haiku
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/90linux-distro
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/90solaris
+drwxr-xr-x	root/root	usr/lib/os-probes/mounted/efi/
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/efi/10elilo
+-rwxr-xr-x	root/root	usr/lib/os-probes/mounted/efi/20microsoft
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/os-prober/
+-rwxr-xr-x	root/root	usr/share/os-prober/common.sh
+drwxr-xr-x	root/root	var/
+drwxr-xr-x	root/root	var/lib/
+drwxr-xr-x	root/root	var/lib/os-prober/
diff --git a/os-prober/.signature b/os-prober/.signature
new file mode 100644
index 000000000..13f345ee0
--- /dev/null
+++ b/os-prober/.signature
@@ -0,0 +1,6 @@
+untrusted comment: verify with /etc/ports/contrib.pub
+RWSagIOpLGJF3/ci18ZZhYCbemHaM8hym2kQrt+1gPPECb2Heu0HMdSV2W71UAz9+NMQwrVKLJUuUzlZaCUvm4J3dMi9tLkcUA4=
+SHA256 (Pkgfile) = 3aca8fa430efd28c71ea9d07f9ffa5e9f387a25c8cdb504643fb9b210e7005cb
+SHA256 (.footprint) = 304a8bff621cd9e72899712ff96855b3a777f9f233dcb4820f32fba094becae7
+SHA256 (os-prober_1.77.tar.xz) = 8d8ea4afbe1aeef3c8b73f74a0fb37b06185e21a6abc78f80fc2160009cf705f
+SHA256 (Fix-CRUX-grub-menu-entry-detection.patch) = cc77faf6fa1eaf281db0c04798dd8c3f81d12722d29527c021e9dfae896ded36
diff --git a/os-prober/Fix-CRUX-grub-menu-entry-detection.patch b/os-prober/Fix-CRUX-grub-menu-entry-detection.patch
new file mode 100644
index 000000000..87c7a64c6
--- /dev/null
+++ b/os-prober/Fix-CRUX-grub-menu-entry-detection.patch
@@ -0,0 +1,12 @@
+--- a/os-probes/mounted/common/90linux-distro	2017-05-04 14:57:23.197520770 +0800
++++ b/os-probes/mounted/common/90linux-distro	2017-05-04 15:09:13.848541790 +0800
+@@ -137,6 +137,9 @@ if (ls "$dir"/lib*/ld*.so* && [ -d "$dir
+ 	elif [ -e "$dir/etc/devuan_version" ]; then
+ 		short="Devuan"
+ 		long="$(printf "Devuan GNU/Linux (%s)\n" "$(cat "$dir/etc/devuan_version")")"
++	elif [ -e "$dir/usr/bin/crux" ]; then
++		short="CRUX"
++		long="$(printf "CRUX GNU/Linux" "$(cat "$dir/usr/bin/crux" | grep echo | cut -b 20-22)")"
+ 	else
+ 		short="Linux"
+ 		long="unknown Linux distribution"
diff --git a/os-prober/Pkgfile b/os-prober/Pkgfile
new file mode 100644
index 000000000..04a242184
--- /dev/null
+++ b/os-prober/Pkgfile
@@ -0,0 +1,31 @@
+# Description: Tool to detect other OSes.
+# URL: http://joey.kitenet.net/code/os-prober
+# Maintainer: Tim Biermann, tbier at posteo dot de
+# Depends on:
+
+name=os-prober
+version=1.77
+release=1
+source=(http://ftp.de.debian.org/debian/pool/main/o/$name/${name}_$version.tar.xz
+Fix-CRUX-grub-menu-entry-detection.patch)
+
+build() {
+  cd $name-$version
+  patch -Np1 -i $SRC/Fix-CRUX-grub-menu-entry-detection.patch
+  # Adjust lib dir to allow detection of 64-bit distros
+  sed -i -e "s:/lib/ld\*\.so\*:/lib*/ld*.so*:g" os-probes/mounted/common/90linux-distro
+  rm -f Makefile
+  make newns
+
+  install -Dm755 linux-boot-prober $PKG/usr/bin/linux-boot-prober
+  install -Dm755 $name $PKG/usr/bin/$name
+  install -Dm755 newns $PKG/usr/lib/$name/newns
+  install -Dm755 common.sh $PKG/usr/share/$name/common.sh
+  for i in os-probes os-probes/mounted os-probes/init linux-boot-probes linux-boot-probes/mounted; do
+    install -dm755 $PKG/usr/lib/$i
+    install -m755 -t $PKG/usr/lib/$i $i/common/*
+    [[ -d $i/x86 ]] && cp -r $i/x86/* $PKG/usr/lib/$i
+  done
+  install -Dm755 os-probes/mounted/powerpc/20macosx $PKG/usr/lib/os-probes/mounted/20macosx
+  install -dm755 $PKG/var/lib/$name
+}