diff --git a/lib/diskman.sh b/lib/diskman.sh
index 59f9138..fa97f70 100644
--- a/lib/diskman.sh
+++ b/lib/diskman.sh
@@ -33,6 +33,7 @@ blank_disk()
         die 19
     fi
 }
+export -f blank_disk
 
 
 # ------------------------------------------------------------------------------
@@ -55,6 +56,8 @@ is_blank()
         return 2
     fi
 }
+export -f is_blank
+
 
 # ------------------------------------------------------------------------------
 # Creating empty partitions
@@ -100,14 +103,16 @@ mkparts()
     fi
     unset device parttype
 }
+export -f mkparts
+
 
 # ------------------------------------------------------------------------------
-# Format drive using ext4 filesystem, parameters will be a list of block device
-mkext4()
+# Generic caller for mkfs.* tools (not exported)
+mkfs_gen()
 {
-     for drv in $@; do
+    for drv in $@; do
         if [[ -b /dev/$drv ]]; then
-            mkfs.ext4 /dev/$drv
+            $mkfstool $MKFSOPT /dev/$drv
         else
             prnt E "/dev/$drv is not a bloc device!"
             die 18
@@ -115,10 +120,60 @@ mkext4()
     done
 }
 
+
 # ------------------------------------------------------------------------------
+# Format drive using ext4 filesystem, parameters will be a list of block device
+mkext4()
+{
+     export mkfstool="mkfs.ext4"
+     mkfs_gen $@
+     unset mkfstool
+}
+export -f mkext4
+
+
+# ------------------------------------------------------------------------------
+# Format a XFS filesystem...
 mkxfs()
 {
-    : # todo
+     export mkfstool="mkfs.xfs"
+     mkfs_gen $@
+     unset mkfstool
 }
+export -f mkxfs
+
+
+# ------------------------------------------------------------------------------
+# ... NTFS ...
+mkntfs()
+{
+     export mkfstool="mkfs.ntfs"
+     mkfs_gen $@
+     unset mkfstool
+}
+export -f mkntfs
+
+
+# ------------------------------------------------------------------------------
+# ... FAT32 ...
+mkfat32()
+{
+     export mkfstool="mkfs.vfat"
+     mkfs_gen $@
+     unset mkfstool
+}
+export -f mkfat32
+
+
+# ------------------------------------------------------------------------------
+# ... BTRFS ...
+mkbtrfs()
+{
+     export mkfstool="mkfs.btrfs"
+     mkfs_gen $@
+     unset mkfstool
+}
+export -f mkbtrfs
+
 
 # EOF