diff --git a/minix/mk.conf.minix b/minix/mk.conf.minix
index 9a845dc4a..d3fb31739 100644
--- a/minix/mk.conf.minix
+++ b/minix/mk.conf.minix
@@ -31,6 +31,7 @@ PS?=		/usr/bin/ps
 NROFF?=		mandoc
 
 PREFER_NATIVE_PTHREADS=	no
+X11_TYPE=	native
 
 # In some cases, MACHINE_GNU_PLATFORM get set back to i386--netbsdelf,
 # make sure the correct triple is set.
@@ -71,7 +72,12 @@ PACKAGES?=	${PKGSRCDIR}/packages/${OS_VERSION}/${MACHINE_ARCH}
 PKGSRC_COMPILER?=	clang
 
 .if ${PKGSRC_COMPILER} == "clang"
+# Check if the clang package is available
+.if exists(/usr/pkg/bin/clang)
+CLANGBASE?=	/usr/pkg
+.else
 CLANGBASE?=	/usr
+.endif
 HAVE_LLVM?=	34
 
 CC?=		clang
@@ -83,6 +89,10 @@ CC?=            gcc
 CXX?=           g++
 .endif
 
+.if exists(/usr/pkg/bin/strip)
+TOOLS_PLATFORM.strip?=	/usr/pkg/bin/strip
+.endif
+
 #######################################################################
 # Compilation Flags for all packages
 CFLAGS+= -march=i586
@@ -108,7 +118,6 @@ RCD_SCRIPTS_DIR?=			${LOCALBASE}/etc/rc.d
 #LSC: the following packages are not yet part of the base system, as expected
 #     on NetBSD
 PREFER_PKGSRC+=		groff
-#PREFER_PKGSRC?=	MesaLib Xft2 Xrandr Xrender glu fontconfig freetype2
 
 PYTHON_VERSION_DEFAULT?=		27
 PYPACKAGE?=				python27
@@ -119,7 +128,5 @@ ZSH_STATIC?=				yes
 #######################################################################
 # Package-specific default options
 PKG_OPTIONS.gcc45?=			-gcc-java -gcc-fortran
-PKG_OPTIONS.groff?=			-x11
-PKG_OPTIONS.ghostscript?=		-x11
 
 .endif # BSD_PKG_MK
diff --git a/minix/pbulk-ng.sh b/minix/pbulk-ng.sh
index 96fec1245..7943f500f 100755
--- a/minix/pbulk-ng.sh
+++ b/minix/pbulk-ng.sh
@@ -77,11 +77,12 @@ NO="no"
 
 # Generate a clean PATH for the jails.
 CHROOT_PATH=""
-for d in ${BOOTSTRAP_PREFIX} /usr/pkg /usr ''
+for d in ${BOOTSTRAP_PREFIX} /usr/pkg /usr/X11R7 /usr ''
 do
 	CHROOT_PATH=${CHROOT_PATH}:${d}/bin:${d}/sbin
 done
-LD_CHROOT_PATH=/usr/pkg/lib:/usr/lib:/lib
+CHROOT_PATH=${CHROOT_PATH}:/usr/games
+LD_CHROOT_PATH=/usr/pkg/lib:/usr/X11R7/lib:/usr/lib:/lib
 
 if [ ! -d $MINIXSRCDIR ]
 then
@@ -155,7 +156,7 @@ build_minix() {
 	echo ":-> Building minix chroot in ${ROOT_MINIX}"
 	(
 		exec 2>&1
-		set -e
+		set +e
 
 		echo ":--> Building minix sources [${BUILD_START}]"
 
@@ -177,8 +178,7 @@ build_minix() {
 			exit 1
 		fi
 
-		if [ ${_cc} = 0 -a ${_clang} = 0 -a
-			! $(cc --version | grep -q clang) ]
+		if [ ${_cc} = 0 -a ${_clang} = 0 -a ! $(cc --version | grep -q clang) ]
 		then
 			echo "It is unsupported to have cc set to someting else than clang,"
 		        echo "while clang is also installed on the system."
@@ -214,6 +214,7 @@ build_minix() {
 			TOOLDIR=${TOOLDIR} \
 			DESTDIR=${ROOT_MINIX} \
 			SLOPPY_FLIST=yes \
+			MKX11=yes \
 			MKUPDATE=yes \
 			${toolchain} \
 			MKKYUA=no \