diff --git a/hooks/arch-filesystems b/hooks/arch-filesystems
index b998b9bce..cc14a3b31 100644
--- a/hooks/arch-filesystems
+++ b/hooks/arch-filesystems
@@ -1,15 +1,32 @@
 run_hook ()
 {
+    # fix reiserfs symlinks
+    ln -s /sbin/debugfs.reiserfs /sbin/debugreiserfs
+    ln -s /sbin/mkfs.reiserfs /sbin/mkreiserfs
+    ln -s /sbin/reiserfsck /sbin/fsck.reiserfs
+    ln -s /sbin/resizefs.reiserfs /sbin/resize_reiserfs
+    ln -s /sbin/tunefs.reiserfs /sbin/reiserfstune
+
     # fix ext2/ext3 symlinks
+    ln -s /sbin/e2fsck /sbin/fsck.ext2
     ln -s /sbin/e2fsck /sbin/fsck.ext3
-    ln -s /sbin/mkfs.ext2 /sbin/mke2fs
+    ln -s /sbin/findfs /sbin/e2label
     ln -s /sbin/findfs /sbin/tune2fs
+    ln -s /sbin/mkfs.ext2 /sbin/mkfs.ext3
+    ln -s /sbin/mkfs.ext2 /sbin/mke2fs
+
+    # fix jfs symlinks
+    ln -s /sbin/jfs_fsck /sbin/fsck.jfs
+    ln -s /sbin/jfs_mkfs /sbin/mkfs.jfs
 
     # fix vfat symlink
     ln -s /sbin/mkdosfs /sbin/mkfs.vfat
     ln -s /sbin/mkdosfs /sbin/mkfs.msdos
     ln -s /sbin/dosfsck /sbin/fsck.msdos
     ln -s /sbin/dosfsck /sbin/fsck.vfat
+    # fix ntfs symlinks
+    ln -s /usr/sbin/mkntfs /sbin/mkfs.ntfs
+    ln -s /usr/sbin/ntfsmount /sbin/mount.ntfs-fuse
 
     # fix ntfs-3g symlink
     ln -s /usr/bin/ntfs-3g /sbin/mount.ntfs-3g
diff --git a/hooks/arch-remote b/hooks/arch-remote
index 478764820..8fb6ab6d4 100644
--- a/hooks/arch-remote
+++ b/hooks/arch-remote
@@ -2,6 +2,8 @@ run_hook ()
 {
     # fix telnet login
     # ln -s /etc/login.sh /bin/login
+    # fix slogin
+    ln -s /usr/bin/ssh /usr/bin/slogin
     # fix screen
     ln -s $(find /usr/bin/screen-*) /usr/bin/screen
     # fix daemons
diff --git a/install/arch-filesystems b/install/arch-filesystems
index 5fa4a7054..c60b2e280 100644
--- a/install/arch-filesystems
+++ b/install/arch-filesystems
@@ -2,8 +2,8 @@
 
 install ()
 {
-    MODULES=" $(checked_modules '/kernel/fs' "
-    BINARIES="mkswap debugreiserfs mkreiserfs fsck.reiserfs reiserfstune resize_reiserfs mke2fs badblocks blkid debugfs dumpe2fs fsck.ext2 e2image e2label fsck logsave resize2fs mkfs.ext3 mkfs.ntfs mount.ntfs-fuse ntfscp ntfsclone ntfslabel ntfsresize ntfsundelete ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls mkfs.jfs fsck.jfs jfs_debugfs jfs_fscklog jfs_logdump jfs_tune mkfs.xfs fsck.xfs xfs_repair xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_freeze xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp mkdosfs dosfsck ntfs-3g"
+    MODULES=" $(checked_modules '/kernel/fs') "
+    BINARIES="mkswap debugfs.reiserfs mkfs.reiserfs reiserfsck tunefs.reiserfs resizefs.reiserfs mke2fs badblocks blkid debugfs dumpe2fs e2fsck e2image findfs fsck logsave mkfs.ext2 resize2fs mkntfs ntfsmount ntfscp ntfsclone ntfslabel ntfsresize ntfsundelete ntfscat ntfscluster ntfscmp ntfsfix ntfsinfo ntfsls jfs_debugfs jfs_fsck jfs_fscklog jfs_logdump jfs_mkfs jfs_tune mkfs.xfs fsck.xfs xfs_repair xfs_admin xfs_bmap xfs_check xfs_copy xfs_db xfs_freeze xfs_growfs xfs_info xfs_io xfs_logprint xfs_mdrestore xfs_metadump xfs_mkfile xfs_ncheck xfs_quota xfs_rtcp mkdosfs dosfsck ntfs-3g"
     FILES=""
     SCRIPT="arch-filesystems"
 }
diff --git a/install/arch-remote b/install/arch-remote
index 13fe2bf74..46eb6540d 100644
--- a/install/arch-remote
+++ b/install/arch-remote
@@ -4,7 +4,7 @@ install ()
 {
     MODULES=" $(checked_modules "/drivers/net/") "
 
-    BINARIES="$(basename $(find /usr/bin/screen-*)) telnet tcpd findssl.sh scp sftp slogin ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sshd pmap_set pmap_dump portmap xinetd in.telnetd rsync"
+    BINARIES="$(basename $(find /usr/bin/screen-*)) telnet tcpd findssl.sh scp sftp ssh ssh-add ssh-agent ssh-copy-id ssh-keygen ssh-keyscan sshd pmap_set pmap_dump portmap xinetd in.telnetd rsync"
     FILES=""
     SCRIPT="arch-remote"
     add_file "/etc/archboot/etc/remote/hosts.allow" "/etc/hosts.allow"