diff --git a/targets/Linux b/targets/Linux
index 60a4460..9b2b060 100644
--- a/targets/Linux
+++ b/targets/Linux
@@ -1,5 +1,5 @@
 #$Id$
-#Copyright (c) 2009 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2008-2012 Pierre Pronchery <khorben@defora.org>
 
 
 
@@ -27,7 +27,7 @@ _create_directories()
 	echo -n "Creating missing directories:"
 	while true; do
 		echo -n " $1"
-		$MKDIR -- "$DESTDIR/$1"				|| exit 2
+		$DEBUG $MKDIR -- "$DESTDIR/$1"			|| exit 2
 		shift || break
 	done
 	echo
diff --git a/targets/Linux-arm b/targets/Linux-arm
index 88f047a..c61d4a5 100644
--- a/targets/Linux-arm
+++ b/targets/Linux-arm
@@ -1,9 +1,10 @@
 #$Id$
-#Copyright (c) 2011 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2008-2012 Pierre Pronchery <khorben@defora.org>
 
 
 
 #variables
+[ -z "$CHMOD"	] && CHMOD="chmod"
 [ -z "$LD"	] && LD="$CC -shared -nostdlib"
 [ -z "$LN"	] && LN="ln -f"
 [ -z "$MKFS"	] && MKFS="mkfs.jffs2 -n -e 0x4000 -l -q -r $DESTDIR -X zlib -o"
@@ -28,19 +29,20 @@ _image_ramdisk_pre()
 
 _image_ramdisk_post()
 {
-	_create_directories "bin" "dev" "lib" "proc" "mnt/root"
+	_create_directories "bin" "dev" "lib" "proc" "mnt/root" \
+								|| exit 2
 
 	echo
 	echo -n "Fixing installation paths:"
 	echo -n " /lib/libc.so"
-	$MV "$DESTDIR$PREFIX/lib/libc.so.0.0" "$DESTDIR/lib/libc.so.0.0" \
-								|| exit 2
-	$LN -s "libc.so.0.0" "$DESTDIR/lib/libc.so"		|| exit 2
-	$LN -s "libc.so.0.0" "$DESTDIR/lib/libc.so.0"		|| exit 2
-	$LN -s "/lib/libc.so.0.0" "$DESTDIR$PREFIX/lib/libc.so.0.0" \
+	$DEBUG $MV "$DESTDIR$PREFIX/lib/libc.so.0.0" \
+		"$DESTDIR/lib/libc.so.0.0"			|| exit 2
+	$DEBUG $LN -s "libc.so.0.0" "$DESTDIR/lib/libc.so"	|| exit 2
+	$DEBUG $LN -s "libc.so.0.0" "$DESTDIR/lib/libc.so.0"	|| exit 2
+	$DEBUG $LN -s "/lib/libc.so.0.0" "$DESTDIR$PREFIX/lib/libc.so.0.0" \
 								|| exit 2
 	echo -n " /bin/sh"
-	$MV "$DESTDIR$PREFIX/bin/sh" "$DESTDIR/bin/sh"		|| exit 2
+	$DEBUG $MV "$DESTDIR$PREFIX/bin/sh" "$DESTDIR/bin/sh"	|| exit 2
 	echo
 
 	if [ ! -x "$DESTDIR/sbin/init" ]; then
@@ -53,22 +55,22 @@ echo "init called with arguments: \$@"
 echo "Falling back to interactive mode:"
 /bin/sh
 EOF
-		chmod 755 "$DESTDIR/linuxrc"
+		$DEBUG $CHMOD 755 "$DESTDIR/linuxrc"
 		echo
 	fi
 
 	echo
 	echo -n "Building ramdisk image:"
-	$MKFS "$IMAGE_FILE"					|| exit 2
+	$DEBUG $MKFS "$IMAGE_FILE"				|| exit 2
 	echo
-	$DU "$IMAGE_FILE"
+	$DEBUG $DU "$IMAGE_FILE"
 
 	echo
 	echo -n "Compressing ramdisk:"
-	$GZIP "$IMAGE_FILE"					|| exit 2
-	$MV "$IMAGE_FILE.gz" "$IMAGE_FILE"			|| exit 2
+	$DEBUG $GZIP "$IMAGE_FILE"				|| exit 2
+	$DEBUG $MV "$IMAGE_FILE.gz" "$IMAGE_FILE"		|| exit 2
 	echo
-	$DU "$IMAGE_FILE"
+	$DEBUG $DU "$IMAGE_FILE"
 }
 
 
@@ -87,13 +89,13 @@ _image_rootfs_pre()
 
 _image_rootfs_post()
 {
-	_create_directories "bin" "dev" "etc" "lib" "sbin"
+	_create_directories "bin" "dev" "etc" "lib" "sbin"	|| exit 2
 
 	echo
 	echo -n "Fixing installation paths:"
 	for i in /lib/libc.so /bin/sh; do
 		echo -n " $i"
-		$MV "$DESTDIR$PREFIX$i" "$DESTDIR$i"		|| exit 2
+		$DEBUG $MV "$DESTDIR$PREFIX$i" "$DESTDIR$i"	|| exit 2
 	done
 	echo
 
@@ -101,7 +103,7 @@ _image_rootfs_post()
 	echo -n "Creating device nodes:"
 	for i in std pty console input fb; do
 		echo -n " $i"
-		(cd "$DESTDIR/dev" && $SUDO sh /sbin/MAKEDEV "$i")
+		(cd "$DESTDIR/dev" && $DEBUG $SUDO sh /sbin/MAKEDEV "$i")
 	done
 	echo
 
@@ -123,24 +125,24 @@ echo "init called with arguments: \$@"
 echo "Falling back to interactive mode:"
 /bin/sh
 EOF
-		chmod 755 "$DESTDIR/sbin/init"
+		$DEBUG $CHMOD 755 "$DESTDIR/sbin/init"
 		echo
 	fi
 
 	echo
 	echo "Building rootfs image:"
-	$MKFS "$IMAGE_FILE"				|| exit 2
-	$DU "$IMAGE_FILE"
+	$DEBUG $MKFS "$IMAGE_FILE"				|| exit 2
+	$DEBUG $DU "$IMAGE_FILE"
 
 	echo
 	echo "Building tarball:"
 	OLDPWD="$PWD"
-	(cd "$DESTDIR" && $TAR -cvzf "$OLDPWD/$IMAGE_FILE.tar.gz" .) \
+	(cd "$DESTDIR" && $DEBUG $TAR -cvzf "$OLDPWD/$IMAGE_FILE.tar.gz" .) \
 	| while read filename; do
 		echo -en "\r$filename"
 	done || (echo && exit 2)
 	echo -en "\r"
-	$DU "$IMAGE_FILE.tar.gz"
+	$DEBUG $DU "$IMAGE_FILE.tar.gz"
 }
 
 
diff --git a/targets/Linux-i386 b/targets/Linux-i386
index 7b7807d..919dd62 100644
--- a/targets/Linux-i386
+++ b/targets/Linux-i386
@@ -1,5 +1,5 @@
 #$Id$
-#Copyright (c) 2011 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2008-2012 Pierre Pronchery <khorben@defora.org>
 
 
 
@@ -27,18 +27,18 @@ _image_image_pre()
 	check "$USAGE" DD DESTDIR DEVZERO IMAGE_FILE IMAGE_KERNEL IMAGE_SIZE \
 		MKDIR MKFS MOUNT UMOUNT
 
-	$MKDIR -- "$DESTDIR"					|| exit 2
-	$UMOUNT "$DESTDIR"
-	$DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" &&
-	$MKFS "$IMAGE_FILE"					|| exit 2
-	$MOUNT "$IMAGE_FILE" "$DESTDIR"				|| exit 2
+	$DEBUG $MKDIR -- "$DESTDIR"				|| exit 2
+	$DEBUG $UMOUNT "$DESTDIR"
+	$DEBUG $DD if="$DEVZERO" of="$IMAGE_FILE" count="$IMAGE_SIZE" &&
+	$DEBUG $MKFS "$IMAGE_FILE"				|| exit 2
+	$DEBUG $MOUNT "$IMAGE_FILE" "$DESTDIR"			|| exit 2
 }
 
 _image_image_post()
 {
-	RET=$?
-	$UMOUNT "$DESTDIR"
-	exit $RET
+	ret=$?
+	$DEBUG $UMOUNT "$DESTDIR"
+	exit $ret
 }
 
 
@@ -56,25 +56,27 @@ _image_iso_pre()
 	check "$USAGE" CAT DESTDIR KERNEL IMAGE_FILE IMAGE_KERNEL INSTALL \
 		MKDIR MKISOFS RAMDISK TAR
 
-	$MKDIR -- "$DESTDIR"					|| exit 2
+	$DEBUG $MKDIR -- "$DESTDIR"				|| exit 2
 }
 
 _image_iso_post()
 {
 	#install kernel with ramdisk and modules
-	$MKDIR -- "$DESTDIR/boot"				|| exit 2
-	$INSTALL -m 755 "$IMAGE_KERNEL" "$DESTDIR/$KERNEL"	|| exit 2
+	$DEBUG $MKDIR -- "$DESTDIR/boot"			|| exit 2
+	$DEBUG $INSTALL -m 755 "$IMAGE_KERNEL" "$DESTDIR/$KERNEL" \
+								|| exit 2
 	if [ ! -z "$IMAGE_RAMDISK" ]; then
-		$INSTALL -m 644 "$IMAGE_RAMDISK" "$DESTDIR/$RAMDISK"
+		$DEBUG $INSTALL -m 644 "$IMAGE_RAMDISK" "$DESTDIR/$RAMDISK" \
+								|| exit 2
 		GRUB_INITRD="initrd $RAMDISK"
 	fi
 	[ ! -z "$IMAGE_MODULES" ] && $CAT "$IMAGE_MODULES" | \
 			(cd "$DESTDIR" && $TAR -xzf -)
 
 	#setup bootloader
-	$MKDIR -- "$DESTDIR/boot/grub"				|| exit 2
-	$INSTALL -m 644 "/usr/lib/grub/i386-pc/stage2_eltorito" \
-	"$DESTDIR/boot/grub"					|| exit 2
+	$DEBUG $MKDIR -- "$DESTDIR/boot/grub"			|| exit 2
+	$DEBUG $INSTALL -m 644 "/usr/lib/grub/i386-pc/stage2_eltorito" \
+		"$DESTDIR/boot/grub"				|| exit 2
 	$CAT > "$DESTDIR/boot/grub/menu.lst" << EOF
 default 0
 timeout 10
@@ -83,9 +85,9 @@ title $VENDOR
 kernel $KERNEL $KERNEL_ARGS
 $GRUB_INITRD
 EOF
-	$MKISOFS -J -r -b "boot/grub/stage2_eltorito" -no-emul-boot \
+	$DEBUG $MKISOFS -J -r -b "boot/grub/stage2_eltorito" -no-emul-boot \
 			-boot-load-size 4 -boot-info-table \
-			-o "$IMAGE_FILE" "$DESTDIR"
+			-o "$IMAGE_FILE" "$DESTDIR"		|| exit 2
 }
 
 
@@ -102,7 +104,7 @@ _image_ramdisk_pre()
 	check "$USAGE" DD DESTDIR DEVZERO DU GENEXT2FS GZIP IMAGE_FILE \
 		IMAGE_SIZE INSTALL LN MKDIR MKFS MV
 
-	$MKDIR -- "$DESTDIR"					|| exit 2
+	$DEBUG $MKDIR -- "$DESTDIR"				|| exit 2
 }
 
 _image_ramdisk_post()
@@ -114,28 +116,31 @@ _image_ramdisk_post()
 	#compile and install linuxrc
 	TOOLS="Apps/Unix/src/others/tools"
 	SUBDIRS="$TOOLS" _target linuxrc			|| exit 2
-	$INSTALL -m 755 "$TOOLS/linuxrc" "$DESTDIR/linuxrc"	|| exit 2
+	$DEBUG $INSTALL -m 755 "$TOOLS/linuxrc" "$DESTDIR/linuxrc" \
+								|| exit 2
 
 	#setup init
 	_create_directories "dev" "lib" "proc" "mnt/cdrom" "sbin" \
 								|| exit 2
-	$LN -s "../mnt/cdrom/usr/bin/sh" "$DESTDIR/sbin/init"	|| exit 2
+	$DEBUG $LN -s "../mnt/cdrom/usr/bin/sh" "$DESTDIR/sbin/init" \
+								|| exit 2
 
 	#install loader
-	$INSTALL -m 755 "$LDSO" "$DESTDIR/lib"			|| exit 2
+	$DEBUG $INSTALL -m 755 "$LDSO" "$DESTDIR/lib"		|| exit 2
 
 	echo
 	echo -n "Creating ramdisk:"
-	$GENEXT2FS -b "$IMAGE_SIZE" -d "$DESTDIR" "$IMAGE_FILE"	|| exit 2
+	$DEBUG $GENEXT2FS -b "$IMAGE_SIZE" -d "$DESTDIR" "$IMAGE_FILE" \
+								|| exit 2
 	echo
 	$DU "$IMAGE_FILE"
 
 	echo
 	echo -n "Compressing ramdisk:"
-	$GZIP "$IMAGE_FILE"					|| exit 2
-	$MV "$IMAGE_FILE.gz" "$IMAGE_FILE"			|| exit 2
+	$DEBUG $GZIP "$IMAGE_FILE"				|| exit 2
+	$DEBUG $MV "$IMAGE_FILE.gz" "$IMAGE_FILE"		|| exit 2
 	echo
-	$DU "$IMAGE_FILE"
+	$DEBUG $DU "$IMAGE_FILE"
 }
 
 
diff --git a/targets/NetBSD b/targets/NetBSD
index 5238023..42aa4bc 100644
--- a/targets/NetBSD
+++ b/targets/NetBSD
@@ -1,5 +1,5 @@
 #$Id$
-#Copyright (c) 2011 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2008-2012 Pierre Pronchery <khorben@defora.org>
 
 
 
diff --git a/targets/NetBSD-amd64 b/targets/NetBSD-amd64
index fba8ffd..3ea924a 100644
--- a/targets/NetBSD-amd64
+++ b/targets/NetBSD-amd64
@@ -1,5 +1,5 @@
 #$Id$
-#Copyright (c) 2011 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2009-2012 Pierre Pronchery <khorben@defora.org>
 
 
 
diff --git a/targets/NetBSD-i386 b/targets/NetBSD-i386
index fba8ffd..37d11dd 100644
--- a/targets/NetBSD-i386
+++ b/targets/NetBSD-i386
@@ -1,5 +1,5 @@
 #$Id$
-#Copyright (c) 2011 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2008-2012 Pierre Pronchery <khorben@defora.org>
 
 
 
diff --git a/targets/NetBSD-sparc b/targets/NetBSD-sparc
index e245f80..0482684 100644
--- a/targets/NetBSD-sparc
+++ b/targets/NetBSD-sparc
@@ -1,5 +1,5 @@
 #$Id$
-#Copyright (c) 2011 Pierre Pronchery <khorben@defora.org>
+#Copyright (c) 2008-2012 Pierre Pronchery <khorben@defora.org>