diff --git a/lib/initcpio/install/arch_base b/lib/initcpio/install/arch_base
index 70629bcaf..e7f9a7578 100644
--- a/lib/initcpio/install/arch_base
+++ b/lib/initcpio/install/arch_base
@@ -3,7 +3,7 @@
 install ()
 {
     SCRIPT="arch_base"
-    BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano netcat printf tail tee test tr tty uptime w who wc which whoami xargs yes syslog-ng bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk parted gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vim-normal lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip wget top sdparm tput ifconfig ln losetup mkdir mkfifo mknod readlink echo gunzip zcat reset swapoff halt telinit awk dir reboot poweroff pidof nc lzcat lzcmp lzdiff lzegrep lzfgrep lzgrep lzless lzma lzmadec lzmore unlzma unxz xz xzcat xzdec switch_root false pivot_root sleep arch ctrlaltdel raw"
+    BINARIES="init agetty mount modprobe modinfo umount basename du clear env head id md5sum nano netcat printf tail tee test tr tty uptime w who wc which whoami xargs yes syslog-ng bash swapon uniq cut seq snarf find sort fdisk sfdisk cfdisk parted gawk cp mv shutdown free ls rm sed test less chgrp chmod chown date df dialog dmesg egrep fgrep grep hostname kill killall killall5 more ps pwd rmdir stty sync tar touch uname vim-normal lsmod modinfo rmmod hdparm true mktemp chroot dirname expr bzip2 hwclock depmod su cat cpio dd gzip wget top sdparm tput ifconfig ln losetup mkdir mkfifo mknod readlink echo gunzip zcat reset swapoff halt telinit awk dir reboot poweroff pidof nc lzcat lzcmp lzdiff lzegrep lzfgrep lzgrep lzless lzma lzmadec lzmore unlzma unxz xz xzcat xzdec switch_root false pivot_root sleep arch ctrlaltdel raw gdisk sgdisk"
 
     ### setting up base structure
     add_dir "/proc"
diff --git a/lib/initcpio/install/arch_pacman b/lib/initcpio/install/arch_pacman
index 8d1579540..b9cc64779 100644
--- a/lib/initcpio/install/arch_pacman
+++ b/lib/initcpio/install/arch_pacman
@@ -23,7 +23,7 @@ smbclient tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware part
 v86d iw crda wireless-regdb libnl iproute2 dhclient syslinux mtools perl \
 gmp heimdal sqlite3 db dbus-core libcap fsarchiver iwlwifi-5150-ucode xz-utils librpcsecgss libtirpc \
 wipe ddrescue testdisk clamav iwlwifi-1000-ucode iwlwifi-6000-ucode ar9170-fw rt2870usb-fw ifplugd \
-libdaemon nouveau-drm nouveau-firmware wpa_actiond rfkill libgssglue"
+libdaemon nouveau-drm nouveau-firmware wpa_actiond rfkill libgssglue gdisk"
 
 for i in $DEPENDS; do
 	for k in  $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do
diff --git a/lib/initcpio/install/arch_pacman_lts b/lib/initcpio/install/arch_pacman_lts
index a04257593..f4e8d554d 100644
--- a/lib/initcpio/install/arch_pacman_lts
+++ b/lib/initcpio/install/arch_pacman_lts
@@ -23,7 +23,7 @@ smbclient tiacx tiacx-firmware dmraid linux-atm netcfg tiacx tiacx-firmware part
 v86d iw crda wireless-regdb libnl iproute2 dhclient syslinux mtools perl \
 gmp heimdal sqlite3 db dbus-core libcap fsarchiver iwlwifi-5150-ucode xz-utils librpcsecgss libtirpc \
 wipe ddrescue testdisk clamav iwlwifi-1000-ucode iwlwifi-6000-ucode ar9170-fw rt2870usb-fw ifplugd \
-libdaemon nouveau-drm wpa_actiond udev-compat rfkill libgssglue"
+libdaemon nouveau-drm wpa_actiond udev-compat rfkill libgssglue gdisk"
 
 for i in $DEPENDS; do
 	for k in  $(echo /var/lib/pacman/local/$i-[0-9]*-[0-9]*); do
diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 6a29b42a5..6d43460a9 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -1106,6 +1106,7 @@ _createraid()
     fi
     # writing raid information to partition table
     if [ "$(echo $RAIDDEVICE | grep /md_d[0-9])" ]; then
+        ### TODO: GPT support missing here!
         for i in $(sfdisk -l $RAIDDEVICE | grep ^/dev | grep -v Empty | grep -v Extended | sed -e 's# .*##g'); do
             # output will be /dev/md_d0*
             # get device name