diff --git a/init.sh b/init.sh
index 9214a3a..1e85480 100755
--- a/init.sh
+++ b/init.sh
@@ -16,15 +16,18 @@ boot_type="efi64"
 repo_dir="repo"
 tmp_dir="tmp"
 current_dir=`pwd`
+
 # In Archlinux, this is default files for syslinux...
 conf_file="conf/archlinux.conf"
 key_mountpoint="/mnt/usbstick"
 device=""
+
 # constant
 APP_NAME="Debian USB Creator"
 VERSION="1.99.0"
-SYSLINUX_EXE=$(which syslinux)
-PARTED_EXE=$(which parted)
+SYSLINUX_EXE=$(command -v syslinux)
+PARTED_EXE=$(command -v parted)
+MCOPY=$(command -v mcopy)
 SYSLINUX_FILES="menu.c32 vesamenu.c32 libutil.c32 libcom32.c32"
 SYSLINUX_BIOS_FILES=""
 SYSLINUX_EFI_FILES="ldlinux.e64"
@@ -225,6 +228,12 @@ then
     exit 1
 fi
 
+if [ "$boot_type" == "bios" ] && [ -z "$MCOPY" ]
+then
+    printf "Bios key creation need mcopy from mtools packages\n"
+    exit 1
+fi
+
 bootfiles_Debian="http://ftp.debian.org/debian/dists/stable/main/installer-${debian_arch}/current/images/hd-media"
 if [ $archive -eq 1 ]
 then
diff --git a/preseeds/preseed.cfg b/preseeds/preseed.cfg
index 310b2af..4c76fc8 100644
--- a/preseeds/preseed.cfg
+++ b/preseeds/preseed.cfg
@@ -1,6 +1,6 @@
 d-i debian-installer/locale string fr_FR
 d-i keyboard-configuration/xkb-keymap select fr(latin9)
-d-i netcfg/choose_interface select eth0
+# d-i netcfg/choose_interface select eth0
 d-i netcfg/get_hostname string unassigned-hostname
 d-i netcfg/get_domain string unassigned-domain
 
@@ -12,6 +12,12 @@ d-i mirror/http/hostname string ftp.fr.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
 
+#
+# REPOS
+#
+d-i apt-setup/contrib boolean true
+d-i apt-setup/non-free boolean true
+
 #
 # USER ACCOUNT
 #
@@ -48,6 +54,7 @@ d-i partman/confirm_nooverwrite boolean true
 # PACKAGES
 #
 tasksel tasksel/first multiselect none
+d-i pkgsel/include string git
 
 #
 # GRUB
diff --git a/preseeds/preseed_swap.cfg b/preseeds/preseed_swap.cfg
index 5fa1106..e78e78b 100644
--- a/preseeds/preseed_swap.cfg
+++ b/preseeds/preseed_swap.cfg
@@ -1,6 +1,6 @@
 d-i debian-installer/locale string fr_FR
 d-i keyboard-configuration/xkb-keymap select fr(latin9)
-d-i netcfg/choose_interface select eth0
+#d-i netcfg/choose_interface select eth0
 d-i netcfg/get_hostname string unassigned-hostname
 d-i netcfg/get_domain string unassigned-domain
 
@@ -12,6 +12,12 @@ d-i mirror/http/hostname string ftp.fr.debian.org
 d-i mirror/http/directory string /debian
 d-i mirror/http/proxy string
 
+#
+# REPOS
+#
+d-i apt-setup/contrib boolean true
+d-i apt-setup/non-free boolean true
+
 #
 # USER ACCOUNT
 #
@@ -48,6 +54,7 @@ d-i partman/confirm_nooverwrite boolean true
 # PACKAGES
 #
 tasksel tasksel/first multiselect none
+d-i pkgsel/include string git
 
 #
 # GRUB