diff --git a/Makefile b/Makefile
index 6c73f14f..83e95678 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,12 @@
 #
 # User-defined variables
 #
-BASE?=/cdrom/usr/freebsd-dist
+#BASE?=/cdrom/usr/freebsd-dist
+BASE=/image
 KERNCONF?= GENERIC
 MFSROOT_FREE_INODES?=10%
 MFSROOT_FREE_BLOCKS?=10%
-MFSROOT_MAXSIZE?=80m
+MFSROOT_MAXSIZE?=100m
 
 # If you want to build your own kernel and make you own world, you need to set
 # -DCUSTOM or CUSTOM=1
@@ -39,7 +40,8 @@ CUSTOMFILESDIR?=customfiles
 TOOLSDIR?=	tools
 PRUNELIST?=	${TOOLSDIR}/prunelist
 KERN_EXCLUDE?=	${TOOLSDIR}/kern_exclude
-PKG_STATIC?=	${TOOLSDIR}/pkg-static
+#PKG_STATIC?=	${TOOLSDIR}/pkg-static
+PKG_STATIC?=	$(which pkg_static)
 #
 # Program defaults
 #
diff --git a/tools/do_gpt.sh b/tools/do_gpt.sh
index e8c98a69..76c5becd 100755
--- a/tools/do_gpt.sh
+++ b/tools/do_gpt.sh
@@ -60,8 +60,14 @@ if [ -n "$VERBOSE" ]; then
 else
   TIME=
 fi
+
 gpart create -s gpt ${unit}
+set +e
 gpart add -t freebsd-boot -b 34 -l boot -s 512K ${unit}
+if [ $? != 0 ]; then
+	gpart add -t freebsd-boot -l boot -s 512K ${unit}
+fi
+set -e
 gpart bootcode -b ${BOOTDIR}/pmbr -p ${BOOTDIR}/gptboot -i 1 ${unit}
 gpart add -t freebsd-ufs -l rootfs ${unit}