diff --git a/srcpkgs/xbps-mklive/files/xbps-mklive.sh b/srcpkgs/xbps-mklive/files/xbps-mklive.sh.in
similarity index 79%
rename from srcpkgs/xbps-mklive/files/xbps-mklive.sh
rename to srcpkgs/xbps-mklive/files/xbps-mklive.sh.in
index 144fa71e76..e6c4e1484d 100644
--- a/srcpkgs/xbps-mklive/files/xbps-mklive.sh
+++ b/srcpkgs/xbps-mklive/files/xbps-mklive.sh.in
@@ -16,8 +16,8 @@ CONFIG_FILE="$HOME/.xbps-mklive.conf"
 # The following vars are overwritten by the config file.
 #
 PACKAGE_REPO="/storage/xbps/packages"
-OUTPUT_FILE="$HOME/xbps-live-$(uname -m).iso"
-ISO_VOLUME="XBPS GNU/Linux Live"
+OUTPUT_FILE="$HOME/xbps-live-$(uname -m)-$(date +%Y%m%d).iso"
+ISO_VOLUME="XBPS GNU/Linux Live $(uname -m)"
 SYSLINUX_DATADIR="/usr/share/syslinux"
 SPLASH_IMAGE=$HOME/splash.rle
 
@@ -53,7 +53,7 @@ mount_pseudofs()
 umount_pseudofs()
 {
 	for fs in sys proc dev; do
-		umount -f $TEMP_ROOTFS/$fs 2>&1 >/dev/null
+		umount -f $TEMP_ROOTFS/$fs >/dev/null 2>&1
 	done
 }
 
@@ -70,6 +70,10 @@ error_out()
 write_etc_motd()
 {
 	cat >> "$TEMP_ROOTFS/etc/motd" <<_EOF
+###############################################################################
+  Autogenerated by xbps-mklive @@MKLIVE_VERSION@@.
+-------------------------------------------------------------------------------
+
 Welcome to the XBPS GNU/Linux Live system, you have been autologged in.
 This user has full sudo(8) permissions without any password, be careful
 executing commands through sudo(8).
@@ -77,13 +81,19 @@ executing commands through sudo(8).
 To play with package management use the xbps-bin(8) and xbps-repo(8)
 utilities. Please visit:
 
-	http://xbps.nopcode.org/
+	http://code.google.com/p/xbps/
 
 For more information and/or documentation about using the X Binary
 Package System. Enjoy it.
 
-		Juan RP <xtraeme@gmail.com>
+Please also visit my personal blog and click to any of the Google ADs,
+to help continuining developping XBPS. Thank you.
 
+	http://xtraeme.blogspot.com/
+
+-- Juan RP <xtraeme@gmail.com>
+
+###############################################################################
 _EOF
 }
 
@@ -110,15 +120,15 @@ MENU COLOR border       * #00000000 #00000000 none
 MENU COLOR sel          * #ffffffff #FF5255FF *
 
 LABEL linux
-MENU LABEL Boot XBPS GNU/Linux ${kver}
+MENU LABEL Boot XBPS GNU/Linux ${kver} ($(uname -m))
 KERNEL /casper/vmlinuz
-INITRD /casper/initrd.gz
+INITRD /casper/initrd.lz
 APPEND boot=casper keymap=es locale=es_ES
 
 LABEL linuxtoram
-MENU LABEL Boot XBPS GNU/Linux ${kver} (toram)
+MENU LABEL Boot XBPS GNU/Linux ${kver} (toram) ($(uname -m))
 KERNEL /casper/vmlinuz
-INITRD /casper/initrd.gz
+INITRD /casper/initrd.lz
 APPEND boot=casper toram keymap=es locale=es_ES
 
 LABEL c
@@ -132,8 +142,6 @@ _EOF
 [ -z "$ISO_VOLUME" ] && error_out
 [ -z "$PACKAGE_REPO" ] && error_out
 
-[ ! -d "$TEMP_ROOTFS/var/db/xbps" ] && mkdir -p "$TEMP_ROOTFS/var/db/xbps"
-
 for _repo_ in ${PACKAGE_REPO}; do
 	info_msg "Adding ${_repo_} package repository..."
 	xbps-repo.static -r $TEMP_ROOTFS add ${_repo_}
@@ -172,23 +180,15 @@ fi
 mount_pseudofs
 
 xbps_relver=$(xbps-bin.static -V)
-xbps-uhelper.static cmpver ${xbps_relver} 20091222
+xbps-uhelper.static cmpver ${xbps_relver} 20100511
 if [ $? -eq 255 ]; then
-	yesflag="-f"
-	for _pkg_ in ${PACKAGE_LIST}; do
-		info_msg "Installing ${_pkg_} package..."
-		xbps-bin.static -r $TEMP_ROOTFS ${yesflag} install ${_pkg_}
-		[ $? -ne 0 ] && error_out $?
-	done
-else
-	yesflag="-y"
-	xbps-bin.static -r $TEMP_ROOTFS ${yesflag} install ${PACKAGE_LIST}
-	[ $? -ne 0 ] && error_out $?
+	info_msg "Your XBPS utilities are outdated... please update to >= 0.5.1"
+	error_out 1
 fi
-xbps-bin.static -r $TEMP_ROOTFS ${yesflag} autoupdate || error_out $?
-xbps-bin.static -r $TEMP_ROOTFS ${yesflag} autoremove || error_out $?
-xbps-bin.static -r $TEMP_ROOTFS ${yesflag} purge all || error_out $?
-xbps-bin.static -r $TEMP_ROOTFS list > $BUILD_TMPDIR/packages.txt
+xbps-bin.static -r $TEMP_ROOTFS -y install ${PACKAGE_LIST} || error_out $?
+xbps-bin.static -r $TEMP_ROOTFS -y autoupdate || error_out $?
+xbps-bin.static -r $TEMP_ROOTFS -yp autoremove || error_out $?
+xbps-bin.static -r $TEMP_ROOTFS list > ${OUTPUT_FILE%.iso}-package-list.txt
 
 info_msg "Creating /etc/motd..."
 write_etc_motd
@@ -197,10 +197,10 @@ info_msg "Rebuilding and copying initramfs..."
 # Set lzma compression for the initramfs, to save space.
 sed -i -e "s|COMPRESSION_TYPE=gzip|COMPRESSION_TYPE=lzma|" \
 	$TEMP_ROOTFS/etc/initramfs-tools/initramfs.conf
-xbps-bin -r $TEMP_ROOTFS -f reconfigure kernel
+xbps-bin.static -r $TEMP_ROOTFS -f reconfigure kernel
 [ $? -ne 0 ] && error_out $?
 cp -f "$TEMP_ROOTFS/boot/initrd.img-${kernel_ver}" \
-	"$BUILD_TMPDIR/casper/initrd.gz" || error_out $?
+	"$BUILD_TMPDIR/casper/initrd.lz" || error_out $?
 mkdir -p $TEMP_ROOTFS/cow
 
 info_msg "Copying kernel binary..."
diff --git a/srcpkgs/xbps-mklive/template b/srcpkgs/xbps-mklive/template
index c12840cfc0..3892199f40 100644
--- a/srcpkgs/xbps-mklive/template
+++ b/srcpkgs/xbps-mklive/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-mklive'
 pkgname=xbps-mklive
-version=0.3.1
+version=0.3.2
 build_style=custom-install
 short_desc="XBPS Live image maker"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -15,8 +15,13 @@ Add_dependency full cdrtools
 Add_dependency full squashfs-tools
 Add_dependency full syslinux
 
+do_build()
+{
+	sed "s|@@MKLIVE_VERSION@@|${version}|g" \
+		${FILESDIR}/${pkgname}.sh.in > ${wrksrc}/${pkgname}.sh
+}
+
 do_install()
 {
-	install -D -m755 ${FILESDIR}/xbps-mklive.sh \
-		${DESTDIR}/usr/sbin/xbps-mklive
+	install -D -m755 ${wrksrc}/${pkgname}.sh ${DESTDIR}/usr/sbin/xbps-mklive
 }