diff --git a/conf/geoffray-levasseur.org/banahaw.conf.sh b/conf/geoffray-levasseur.org/banahaw.conf.sh
new file mode 100644
index 0000000..cb313a7
--- /dev/null
+++ b/conf/geoffray-levasseur.org/banahaw.conf.sh
@@ -0,0 +1,71 @@
+# Fichier de configuration principal
+
+# ------------------------------------------------------------------------------
+# -------------------- Importation de paramêtres globaux -----------------------
+# ------------------------------------------------------------------------------
+
+# Importe les paramètres geoffray-levasseur.org
+. $MYPATH/conf/includes/gl.conf.sh
+
+# Importe la sélection de paquets par défaut
+. $MYPATH/conf/includes/pkgsel.base.conf.sh
+
+# Les paramètres précédemment importés sont surchargeable après cette ligne
+
+# ------------------------------------------------------------------------------
+# ------------------------------ General Section -------------------------------
+# ------------------------------------------------------------------------------
+
+# User of the machine (must exists)
+MAINUSER=root
+
+# Pilotes X11 non libre à installer ?
+#X11_DRV="virtualbox-guest-dkms virtualbox-guest-utils virtualbox-guest-x11"
+
+# Authentication: use LDAP+Kerberos ?
+WITH_LDAP_KERB=no
+
+# Users to create, add or remove
+REMOVE_USERS=fatal
+
+# Network
+IPV4_IFACES="eth0 eth1"
+
+NET4_MODE_eth0="static"
+NET4_IP_eth0="192.168.1.201/24"
+NET4_GW_eth0="192.168.1.230"
+NET4_NS_eth0="192.168.1.205 192.168.1.206"
+NET4_NS_SEARCH_eth0=$REALM
+
+NET4_MODE_eth2="static"
+NET4_IP_eth2="10.42.0.201/16"
+
+IPV6_IFACES=""
+
+#NET6_MODE_eth0="static"
+#NET6_IP_eth0="2a03:7220:8081:b301::dd/64"
+#NET6_GW_eth0="2a03:7220:8081:b301::e7"
+#NET6_NS_eth0="2a03:7220:8081:b301::ce 2a03:7220:8081:b301::cd"
+#NET6_NS_SEARCH_eth0=$REALM
+
+#NET6_MODE_eth1="static"
+#NET6_IP_eth1="2a03:7220:8081:b34a::dd/64"
+
+
+# Mode d'installation :
+# * dev : installe les paquets un par un avec apt (lent)
+# * full : envoie d'un seul coup la liste de tous les paquets à apt (rapide)
+INTALL_MODE=full
+
+# Paquets additionnels
+PKGSEL="$PKGSEL time traceroute apache2 graphviz php smbclient poppler-utils \
+        php-cgi php-cli php-gd php-sqlite3 php-pear rsync"
+
+# ------------------------------------------------------------------------------
+# -------------------------- Section modules d'init ----------------------------
+# ------------------------------------------------------------------------------
+
+# Liste des modules à executer (surchargeable en ligne de commande)
+MODULE_LIST="conf_ntp upgrade_dist conf_ceph authnz conf_locale conf_ssh \
+	conf_mail install_pkg install_profile patch_snmp install_mkagent \
+        conf_syslog conf_network"
diff --git a/conf/includes/gl.conf.sh b/conf/includes/gl.conf.sh
index aac0e5d..c223ee1 100644
--- a/conf/includes/gl.conf.sh
+++ b/conf/includes/gl.conf.sh
@@ -32,7 +32,7 @@ export SHARED_HOME="false"
 export SSHD_PERMITROOT_RANGE="192.168.1.0/24"
 
 # Check MK
-export MK_VERSION="2.2.0b6-1"
+export MK_VERSION="2.2.0p21-1"
 export MK_URL="https://nagios.geoffray-levasseur.org/check_mk/check_mk/agents/check-mk-agent_${MK_VERSION}_all.deb"
 export MK_SERVER_IP="192.168.1.201"
 
diff --git a/conf/includes/mam.conf.sh b/conf/includes/mam.conf.sh
index 6340266..0f5d325 100644
--- a/conf/includes/mam.conf.sh
+++ b/conf/includes/mam.conf.sh
@@ -41,7 +41,7 @@ export MOUNTPOINT_data="/data"
 export SSHD_PERMITROOT_RANGE="10.254.1.0/24"
 
 # Check MK
-export MK_VERSION="2.2.0p17-1"
+export MK_VERSION="2.2.0p21-1"
 export MK_URL="http://192.168.1.201/check_mk/check_mk/agents/check-mk-agent_${MK_VERSION}_all.deb"
 export MK_SERVER_IP="192.168.1.201"
 
diff --git a/lib/diskman.sh b/lib/diskman.sh
index 4ddd7fb..e3e022d 100644
--- a/lib/diskman.sh
+++ b/lib/diskman.sh
@@ -66,6 +66,8 @@ export -f is_blank
 # Partition size like 10G for 10 GiB, 600M for 600 MiB and so on... Without unit
 # it will use a number of cylinder. 0 will stand for all remaining size.
 # If no partition size is provided we create a single whole disk partition.
+# TODO: support extended partition for DOS type, add error if trying to create
+# more than 4 primary partitions
 mkparts()
 {
     local device=$1 && shit