diff --git a/bootstrap.sh b/bootstrap.sh
index d5fb309..49320b3 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -148,6 +148,7 @@ osx_homebrew()
 ###############################################################################
 freebsd()
 {
+    set -xe
     echo "FreeBSD detected!"
     echo "Installing missing packages..."
 
@@ -168,6 +169,7 @@ freebsd()
     install_freebsd_pkg "cmake"
     install_freebsd_pkg "gmake"
     install_freebsd_pkg "wget"
+    set +xe
 }
 
 ###############################################################################
diff --git a/mk/config.mk b/mk/config.mk
index 1b5e028..5140291 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -18,7 +18,7 @@ ifeq ($(UNAME),Darwin)
 	PREFIX_BINARY=0
 	VB_AUDIO=coreaudio
 	VBM=/Applications/VirtualBox.app/Contents/MacOS/VBoxManage
-ifeq ($(UNAME),FreeBSD)
+else ifeq ($(UNAME),FreeBSD)
 	FUMOUNT=sudo umount
 	export NPROC=sysctl -n hw.ncpu
 	PREFIX_BINARY=0