diff --git a/src/share/mk/sys.mk b/src/share/mk/sys.mk
index d412938..712fb44 100644
--- a/src/share/mk/sys.mk
+++ b/src/share/mk/sys.mk
@@ -1,13 +1,11 @@
 # This variable should be used to differentiate Minix builds in Makefiles.
-__MINIX=	yes
+__UBIX=	yes
 
-.if !defined(__MINIX)
-unix?=		We run NetBSD.
-
+.if !defined(__UBIX)
+unix?=		We run BSD
 .SUFFIXES: .a .o .ln .s .S .c .cc .cpp .cxx .C .f .F .r .p .l .y .sh
 .else
-unix?=		We run MINIX.
-
+unix?=		We run UBIX.
 .SUFFIXES: .a .o .bc .ln .s .S .c .cc .cpp .cxx .C .f .F .r .p .l .y .sh
 
 .if ${MKSMALL:U} == "yes"
@@ -16,7 +14,7 @@
 .endif
 
 .if ${MKMAGIC:Uno} == "yes" || ${MKASR:Uno} == "yes"
-CPPFLAGS+= -D_MINIX_MAGIC=1
+CPPFLAGS+= -D_UBIX_MAGIC=1
 STRIPFLAG= -s
 DBG=-g
 .endif
@@ -29,7 +27,7 @@
 .if exists(/usr/pkg/bin/gcc) || exists(/usr/bin/gcc)
 CC?=	gcc
 .endif
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 
 .LIBS:		.a
 
@@ -61,11 +59,11 @@
 .else
 DBG?=	-O2
 .endif
-.if !defined(__MINIX)
+.if !defined(__UBIX)
 CFLAGS?=	${DBG}
 .else
 CFLAGS+=	${DBG}
-.endif # !defined(__MINIX)
+.endif # !defined(__UBIX)
 LDFLAGS?=
 COMPILE.c?=	${CC} ${CFLAGS} ${CPPFLAGS} -c
 LINK.c?=	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}
@@ -79,7 +77,7 @@
 
 __ALLSRC1=	${empty(DESTDIR):?${.ALLSRC}:${.ALLSRC:S|^${DESTDIR}|^destdir|}}
 __ALLSRC2=	${empty(MAKEOBJDIR):?${__ALLSRC1}:${__ALLSRC1:S|^${MAKEOBJDIR}|^obj|}}
-__ALLSRC3=	${empty(NETBSDSRCDIR):?${__ALLSRC2}:${__ALLSRC2:S|^${NETBSDSRCDIR}|^src|}}
+__ALLSRC3=	${empty(UBIXBSDSRCDIR):?${__ALLSRC2}:${__ALLSRC2:S|^${UBIXBSDSRCDIR}|^src|}}
 __BUILDSEED=	${BUILDSEED}/${__ALLSRC3:O}/${.TARGET}
 _CXXSEED?=	${BUILDSEED:D-frandom-seed=${__BUILDSEED:hash}}
 
diff --git a/src/share/mk/ubix.clang-analyze.mk b/src/share/mk/ubix.clang-analyze.mk
index 81912be..fee5204 100644
--- a/src/share/mk/ubix.clang-analyze.mk
+++ b/src/share/mk/ubix.clang-analyze.mk
@@ -1,5 +1,3 @@
-# $NetBSD: bsd.clang-analyze.mk,v 1.3 2012/04/04 10:37:18 joerg Exp $
-
 .ifndef CLANG_ANALYZE_SRCS
 
 CLANG_ANALYZE_FLAGS+=	--analyze
diff --git a/src/share/mk/ubix.clean.mk b/src/share/mk/ubix.clean.mk
index 1102698..bddfff9 100644
--- a/src/share/mk/ubix.clean.mk
+++ b/src/share/mk/ubix.clean.mk
@@ -1,4 +1,4 @@
-# $NetBSD: ubix.clean.mk,v 1.8 2012/11/19 16:04:54 apb Exp $
+# $UBIXBSD: ubix.clean.mk,v 1.8 2012/11/19 16:04:54 apb Exp $
 
 # <ubix.clean.mk>
 #
@@ -26,8 +26,8 @@
 # delete a directory as part of "make clean" or "make cleandir" then you
 # need to provide your own target.
 
-.if !defined(_BSD_CLEAN_MK_)
-_BSD_CLEAN_MK_=1
+.if !defined(_UBIX_CLEAN_MK_)
+_UBIX_CLEAN_MK_=1
 
 .include <ubix.init.mk>
 
@@ -88,4 +88,4 @@
 .MAKE.DEPENDFILE := .depend.no-such-file
 .endif
 
-.endif	# !defined(_BSD_CLEAN_MK)
+.endif	# !defined(_UBIX_CLEAN_MK)
diff --git a/src/share/mk/ubix.dep.mk b/src/share/mk/ubix.dep.mk
index 6c89f0b..0559faf 100644
--- a/src/share/mk/ubix.dep.mk
+++ b/src/share/mk/ubix.dep.mk
@@ -29,10 +29,10 @@
 __DPSRCS.d=	${__DPSRCS.all:O:u:M*.d}
 __DPSRCS.notd=	${__DPSRCS.all:O:u:N*.d}
 
-.if defined(__MINIX)
+.if defined(__UBIX)
 __DPSRCS.bcd=	${"${USE_BITCODE:Uno}" == "yes":? ${SRCS:M*.c:O:u:.c=.bcd}:}
 __DPSRCS.d+=	${__DPSRCS.bcd}
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 
 .NOPATH: .depend ${__DPSRCS.d}
 
@@ -59,7 +59,7 @@
 	rm -f .depend
 	${MKDEP} ${_MKDEP_MERGEFLAGS} -d -f ${.TARGET} ${__DPSRCS.d}
 
-.if !defined(__MINIX)
+.if !defined(__UBIX)
 .SUFFIXES: .d .s .S .c .C .cc .cpp .cxx .m
 .else
 .SUFFIXES: .bcd .d .s .S .c .C .cc .cpp .cxx .m
@@ -71,7 +71,7 @@
 	    ${CFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
 	    ${CPPFLAGS} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC}
 .endif # ${USE_BITCODE:Uno} == "yes"
-.endif # !defined(__MINIX)
+.endif # !defined(__UBIX)
 
 .c.d:
 	${_MKTARGET_CREATE}
diff --git a/src/share/mk/ubix.files.mk b/src/share/mk/ubix.files.mk
index 651fdeb..4e65650 100644
--- a/src/share/mk/ubix.files.mk
+++ b/src/share/mk/ubix.files.mk
@@ -1,7 +1,7 @@
-#	$NetBSD: ubix.files.mk,v 1.43 2013/04/06 15:39:19 uebayasi Exp $
+#	$UBIXBSD: ubix.files.mk,v 1.43 2013/04/06 15:39:19 uebayasi Exp $
 
-.if !defined(_BSD_FILES_MK_)
-_BSD_FILES_MK_=1
+.if !defined(_UBIX_FILES_MK_)
+_UBIX_FILES_MK_=1
 
 .include <ubix.init.mk>
 
@@ -159,4 +159,4 @@
 .include <ubix.sys.mk>
 .include <ubix.clean.mk>
 
-.endif	# !defined(_BSD_FILES_MK_)
+.endif	# !defined(_UBIX_FILES_MK_)
diff --git a/src/share/mk/ubix.gcc.mk b/src/share/mk/ubix.gcc.mk
index c315615..73f3160 100644
--- a/src/share/mk/ubix.gcc.mk
+++ b/src/share/mk/ubix.gcc.mk
@@ -1,7 +1,7 @@
-#	$NetBSD: ubix.gcc.mk,v 1.11 2015/06/07 15:04:28 matt Exp $
+#	$UBIXBSD: ubix.gcc.mk,v 1.11 2015/06/07 15:04:28 matt Exp $
 
-.if !defined(_BSD_GCC_MK_)
-_BSD_GCC_MK_=1
+.if !defined(_UBIX_GCC_MK_)
+_UBIX_GCC_MK_=1
 
 .if defined(EXTERNAL_TOOLCHAIN)
 _GCC_CRTBEGIN!=		${CC} --print-file-name=crtbegin.o
@@ -31,4 +31,4 @@
 _GCC_LIBGCCDIR?=	${DESTDIR}/usr/lib${MLIBDIR:D/${MLIBDIR}}
 .endif
 
-.endif	# ! defined(_BSD_GCC_MK_)
+.endif	# ! defined(_UBIX_GCC_MK_)
diff --git a/src/share/mk/ubix.inc.mk b/src/share/mk/ubix.inc.mk
index c0b4238..4434e51 100644
--- a/src/share/mk/ubix.inc.mk
+++ b/src/share/mk/ubix.inc.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: ubix.inc.mk,v 1.32 2006/03/16 18:43:34 jwise Exp $
+#	$UBIXBSD: ubix.inc.mk,v 1.32 2006/03/16 18:43:34 jwise Exp $
 
 .include <ubix.init.mk>
 
diff --git a/src/share/mk/ubix.kernobj.mk b/src/share/mk/ubix.kernobj.mk
index ba3c9ed..e46cf5d 100644
--- a/src/share/mk/ubix.kernobj.mk
+++ b/src/share/mk/ubix.kernobj.mk
@@ -1,7 +1,7 @@
-#	$NetBSD: bsd.kernobj.mk,v 1.14 2013/06/03 07:39:07 mrg Exp $
+#	$UBIXBSD: bsd.kernobj.mk,v 1.14 2013/06/03 07:39:07 mrg Exp $
 
 # KERNSRCDIR	Is the location of the top of the kernel src.
-# 		It defaults to `${NETBSDSRCDIR}/sys'.
+# 		It defaults to `${UBIXBSDSRCDIR}/sys'.
 #
 # KERNARCHDIR	Is the location of the machine dependent kernel sources.
 #		It defaults to `arch/${MACHINE}', but may be overridden
@@ -23,7 +23,7 @@
 
 .include <bsd.own.mk>
 
-KERNSRCDIR?=		${NETBSDSRCDIR}/sys
+KERNSRCDIR?=		${UBIXBSDSRCDIR}/sys
 KERNARCHDIR?=		arch/${MACHINE}
 KERNCONFDIRDEFAULT?=	${KERNSRCDIR}/${KERNARCHDIR}/conf
 KERNCONFDIR?=		${KERNCONFDIRDEFAULT}
diff --git a/src/share/mk/ubix.lib.mk b/src/share/mk/ubix.lib.mk
index 73867e3..d4945f6 100644
--- a/src/share/mk/ubix.lib.mk
+++ b/src/share/mk/ubix.lib.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.362 2015/09/08 16:06:42 uebayasi Exp $
+#	$UBIXBSD: bsd.lib.mk,v 1.362 2015/09/08 16:06:42 uebayasi Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -75,11 +75,11 @@
 
 # Check for higher installed library versions.
 .if !defined(NOCHECKVER) && !defined(NOCHECKVER_${LIB}) && \
-	exists(${NETBSDSRCDIR}/lib/checkver)
+	exists(${UBIXBSDSRCDIR}/lib/checkver)
 checkver:
 	@(cd "${.CURDIR}" && \
 	    HOST_SH=${HOST_SH:Q} AWK=${TOOL_AWK:Q} \
-	    ${HOST_SH} ${NETBSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
+	    ${HOST_SH} ${UBIXBSDSRCDIR}/lib/checkver -v ${SHLIB_VERSION_FILE} \
 		    -d ${_DEST.OBJ} ${LIB})
 .endif
 .endif									# }
@@ -137,7 +137,7 @@
 #			numbers of shared library
 # SHLIB_SOVERSION:	version number to be compiled into a shared library
 #			via -soname. Usualy ${SHLIB_MAJOR} on ELF.
-#			NetBSD/pmax used to use ${SHLIB_MAJOR}[.${SHLIB_MINOR}
+#			UBIXBSD/pmax used to use ${SHLIB_MAJOR}[.${SHLIB_MINOR}
 #			[.${SHLIB_TEENY}]]
 # SHLIB_SHFLAGS:	Flags to tell ${LD} to emit shared library.
 #			with ELF, also set shared-lib version for ld.so.
@@ -207,12 +207,12 @@
 LIBSTRIPSHLIBOBJS=	yes
 .endif
 
-.if defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
+.if defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
 SHLIB_SHFLAGS+= -L ${DESTDIR}/usr/lib
 SHLIB_SHFLAGS+= -Wl,-plugin=${GOLD_PLUGIN} \
 		-Wl,-plugin-opt=-disable-opt
 
-SECTIONIFYPASS?=${NETBSDSRCDIR}/minix/llvm/bin/sectionify.so
+SECTIONIFYPASS?=${UBIXBSDSRCDIR}/minix/llvm/bin/sectionify.so
 # dcvmoole: the following construction is a hack for libmagicrt.  For reasons
 # not entirely under our control, clang refuses to take .bc objects even when
 # using the gold linker, saying that LLVM IR code cannot be linked.  In order
@@ -238,7 +238,7 @@
 .cc.bc .cxx.bc .cpp.bc:
 	${_MKTARGET_COMPILE}
 	${COMPILE.cc} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET} -flto
-.endif # defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
+.endif # defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
 .c.o:
 	${_MKTARGET_COMPILE}
 	${COMPILE.c} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} -o ${.TARGET}
@@ -433,9 +433,9 @@
 _LIB_g.a:=${_LIB}_g.a
 _LIB_pic.a:=${_LIB}_pic.a
 _LIB.ln:=llib-l${LIB}.ln
-.if defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
+.if defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
 _LIB_bc.a:=${_LIB}_bc.a
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 
 .if ${MKPIC} != "no" && defined(SHLIB_FULLVERSION)
 _LIB.so:=${_LIB}.so
@@ -659,14 +659,14 @@
 .else
 LDLIBC ?= -nodefaultlibs
 .if ${HAVE_LIBGCC} == "yes" && (${LIB} == "c" || ${LIB} == "minc")
-.if !defined(__MINIX)
+.if !defined(__UBIX)
 LDADD+= -lgcc
 .else
 LDADD+= ${${ACTIVE_CC} == "gcc":? -lgcc:}
 .if ${MACHINE_ARCH} == "earm"
 LDADD+= ${${ACTIVE_CC} == "gcc":? -lgcc_eh:}
 .endif # ${MACHINE_ARCH} == "earm"
-.endif # !defined(__MINIX)
+.endif # !defined(__UBIX)
 .endif
 .endif
 .endif
@@ -758,12 +758,12 @@
 libclean3: .PHONY .MADE __cleanuse LIBCLEANFILES3
 libclean4: .PHONY .MADE __cleanuse LIBCLEANFILES4
 libclean5: .PHONY .MADE __cleanuse LIBCLEANFILES5
-.if defined(__MINIX)
+.if defined(__UBIX)
 # MINIX: core conflicts with core/ in lib/liblwip
 CLEANFILES+= a.out [Ee]rrs mklog *.core
 .else
 CLEANFILES+= a.out [Ee]rrs mklog core *.core
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 LIBCLEANFILES1+= ${_LIB.a}   ${STOBJS} ${STOBJS:=.tmp}
 LIBCLEANFILES2+= ${_LIB_p.a} ${POBJS}  ${POBJS:=.tmp}
 LIBCLEANFILES3+= ${_LIB_g.a} ${GOBJS}  ${GOBJS:=.tmp}
@@ -774,7 +774,7 @@
 LIBCLEANFILES4+= ${SOBJS} ${SOBJS:=.tmp}
 LIBCLEANFILES5+= ${_LIB.ln} ${LOBJS}
 
-.if defined(__MINIX)
+.if defined(__UBIX)
 clean: libclean6
 libclean6: .PHONY .MADE __cleanuse LIBCLEANFILES6
 LIBCLEANFILES6+= ${_LIB_bc.a} ${BCOBJS} ${BCOBJS:=.tmp}
diff --git a/src/share/mk/ubix.links.mk b/src/share/mk/ubix.links.mk
index ffb695f..e8e56f5 100644
--- a/src/share/mk/ubix.links.mk
+++ b/src/share/mk/ubix.links.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: ubix.links.mk,v 1.34 2009/04/10 16:16:12 apb Exp $
+#	$UBIXBSD: ubix.links.mk,v 1.34 2009/04/10 16:16:12 apb Exp $
 
 .include <ubix.init.mk>
 
diff --git a/src/share/mk/ubix.man.mk b/src/share/mk/ubix.man.mk
index 373870e..0e151cd 100644
--- a/src/share/mk/ubix.man.mk
+++ b/src/share/mk/ubix.man.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: ubix.man.mk,v 1.117 2014/12/19 22:25:39 christos Exp $
+#	$UBIXBSD: ubix.man.mk,v 1.117 2014/12/19 22:25:39 christos Exp $
 #	@(#)ubix.man.mk	8.1 (Berkeley) 6/8/93
 
 .include <ubix.init.mk>
diff --git a/src/share/mk/ubix.nls.mk b/src/share/mk/ubix.nls.mk
index 04dec18..aab391d 100644
--- a/src/share/mk/ubix.nls.mk
+++ b/src/share/mk/ubix.nls.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: ubix.nls.mk,v 1.47 2011/09/10 16:57:35 apb Exp $
+#	$UBIXBSD: ubix.nls.mk,v 1.47 2011/09/10 16:57:35 apb Exp $
 
 .include <ubix.init.mk>
 
diff --git a/src/share/mk/ubix.obj.mk b/src/share/mk/ubix.obj.mk
index 60c87a8..36a68e5 100644
--- a/src/share/mk/ubix.obj.mk
+++ b/src/share/mk/ubix.obj.mk
@@ -1,7 +1,7 @@
-#	$NetBSD: ubix.obj.mk,v 1.49 2010/01/25 00:43:00 christos Exp $
+#	$UBIXBSD: ubix.obj.mk,v 1.49 2010/01/25 00:43:00 christos Exp $
 
-.if !defined(_BSD_OBJ_MK_)
-_BSD_OBJ_MK_=1
+.if !defined(_UBIX_OBJ_MK_)
+_UBIX_OBJ_MK_=1
 
 .include <ubix.own.mk>
 
@@ -106,4 +106,4 @@
 
 .include <ubix.sys.mk>
 
-.endif	# !defined(_BSD_OBJ_MK_)
+.endif	# !defined(_UBIX_OBJ_MK_)
diff --git a/src/share/mk/ubix.own.mk b/src/share/mk/ubix.own.mk
index 272c545..f0a9920 100644
--- a/src/share/mk/ubix.own.mk
+++ b/src/share/mk/ubix.own.mk
@@ -6,7 +6,7 @@
 .if !defined(_UBIX_OWN_MK_)
 _UBIX_OWN_MK_=1
 
-.if defined(__MINIX)
+.if defined(__UBIX)
 
 LDSTATIC?=	-static
 MKDYNAMICROOT?=	no
@@ -170,7 +170,7 @@
 # The default value of MKBINUTILS cannot be set before the previous test.
 MKBINUTILS?=	no
 
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 
 MAKECONF?=	/etc/mk.conf
 .-include "${MAKECONF}"
@@ -571,11 +571,11 @@
 
 # Clang supports C, C++ and Objective C
 TOOL_CC.clang=		clang
-.if defined(__MINIX)
+.if defined(__UBIX)
 TOOL_CPP.clang=		clang -E
 .else
 TOOL_CPP.clang=		clang-cpp
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 TOOL_CXX.clang=		clang++
 TOOL_OBJC.clang=	clang
 TOOL_OPT.clang=		opt
@@ -601,7 +601,7 @@
 TOOL_CAP_MKDB=		cap_mkdb
 TOOL_CAT=		cat
 TOOL_CKSUM=		cksum
-.if defined(__MINIX)
+.if defined(__UBIX)
 # LSC: A full path has to be provided, as this is also used as a make
 #      target.
 .  if  exists(/usr/pkg/bin/clang-tblgen)
@@ -611,7 +611,7 @@
 .  endif # exists(/usr/pkg/bin/clang-tblgen)
 .else
 TOOL_CLANG_TBLGEN=	clang-tblgen
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 TOOL_COMPILE_ET=	compile_et
 TOOL_CONFIG=		config
 TOOL_CRUNCHGEN=		crunchgen
@@ -635,7 +635,7 @@
 TOOL_INSTALLBOOT=	installboot
 TOOL_INSTALL_INFO=	install-info
 TOOL_JOIN=		join
-.if defined(__MINIX)
+.if defined(__UBIX)
 # LSC: A full path has to be provided, as this is also used as a make
 #      target.
 .  if  exists(/usr/pkg/bin/llvm-tblgen)
@@ -645,25 +645,25 @@
 .  endif # exists(/usr/pkg/bin/llvm-tblgen)
 .else
 TOOL_LLVM_TBLGEN=	llvm-tblgen
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 TOOL_M4=		m4
 TOOL_MACPPCFIXCOFF=	macppc-fixcoff
 TOOL_MAKEFS=		makefs
 TOOL_MAKEINFO=		makeinfo
-.if defined(__MINIX)
+.if defined(__UBIX)
 # LSC: A full path has to be provided, as this is also used as a make
 #      target.
 TOOL_MAKEKEYS=		/usr/X11R7/bin/makekeys
 .else
 TOOL_MAKEKEYS=		makekeys
-.endif # defined(__MINIX)
-.if defined(__MINIX)
+.endif # defined(__UBIX)
+.if defined(__UBIX)
 # LSC: A full path has to be provided, as this is also used as a make
 #      target.
 TOOL_MAKESTRS=		/usr/X11R7/bin/makestrs
 .else
 TOOL_MAKESTRS=		makestrs
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 TOOL_MAKEWHATIS=	/usr/libexec/makewhatis
 TOOL_MANDOC_ASCII=	mandoc -Tascii
 TOOL_MANDOC_HTML=	mandoc -Thtml
@@ -704,20 +704,20 @@
 TOOL_SOELIM=		soelim
 TOOL_SPARKCRC=		sparkcrc
 TOOL_STAT=		stat
-.if defined(__MINIX)
+.if defined(__UBIX)
 TOOL_STRFILE=		/usr/games/strfile
 .else
 TOOL_STRFILE=		strfile
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 TOOL_SUNLABEL=		sunlabel
 TOOL_TBL=		tbl
-.if defined(__MINIX)
+.if defined(__UBIX)
 # LSC: There is a tic packaged, which has a completly different set of
 #      options, so make sure to use the base system one, always.
 TOOL_TIC=		/usr/bin/tic
 .else
 TOOL_TIC=		tic
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 TOOL_TOPROTO=		toproto
 TOOL_UUDECODE=		uudecode
 TOOL_VGRIND=		vgrind -f
@@ -1036,7 +1036,7 @@
 GNU_ARCH.sh3el=shle
 GNU_ARCH.mips64eb=mips64
 
-.if defined(__MINIX)
+.if defined(__UBIX)
 # MINIX/arm default
 GCC_CONFIG_ARCH.earm=armv7-a
 
@@ -1044,7 +1044,7 @@
 GNU_ARCH.i386=i586
 GCC_CONFIG_ARCH.i386=i586
 
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 
 MACHINE_GNU_ARCH=${GNU_ARCH.${MACHINE_ARCH}:U${MACHINE_ARCH}}
 
@@ -1067,7 +1067,7 @@
 MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netubix
 .endif
 
-.if defined(__MINIX)
+.if defined(__UBIX)
 # We have a simpler toolchain naming scheme
 MACHINE_GNU_PLATFORM:=${MACHINE_GNU_ARCH}-elf32-minix
 
@@ -1087,7 +1087,7 @@
       USE_BITCODE:=no
 .    endif
 .  endif # ${_HAVE_GOLD:U} == ""
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 
 .if !empty(MACHINE_ARCH:M*arm*)
 # Flags to pass to CC for using the old APCS ABI on ARM for compat or stand.
diff --git a/src/share/mk/ubix.prog.mk b/src/share/mk/ubix.prog.mk
index af22409..e1f51e4 100644
--- a/src/share/mk/ubix.prog.mk
+++ b/src/share/mk/ubix.prog.mk
@@ -270,10 +270,10 @@
 PAM_STATIC_DPADD=
 .endif
 
-.if defined(__MINIX) && ${MACHINE_ARCH} == "earm"
+.if defined(__UBIX) && ${MACHINE_ARCH} == "earm"
 # LSC: On ARM, when compiling statically, with gcc, lgcc_eh is required
 LDFLAGS+= ${${ACTIVE_CC} == "gcc":? -lgcc_eh:}
-.endif # defined(__MINIX) && ${MACHINE_ARCH} == "earm"
+.endif # defined(__UBIX) && ${MACHINE_ARCH} == "earm"
 
 #	NB:	If you are a library here, add it in ubix.README
 .for _lib in \
@@ -369,10 +369,10 @@
 PROG=		${PROG_CXX}
 _CCLINK=	${CXX} ${_CCLINKFLAGS}
 
-.if defined(__MINIX)
+.if defined(__UBIX)
 # BJG - stack unwinding (for C++ exceptions) doesn't work on static executables when built with llvm.
 LDSTATIC=	-dynamic
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 .endif
 
 .if defined(RUMPPRG)
@@ -474,7 +474,7 @@
 .endfor
 
 # Language-independent definitions.
-.if defined(__MINIX)
+.if defined(__UBIX)
 .if ${USE_BITCODE:Uno} == "yes"
 CFLAGS+= -flto
 .endif # ${USE_BITCODE:Uno} == "yes"
@@ -484,7 +484,7 @@
 #    a sysroot parameter has been given.
 LDFLAGS+= -L ${DESTDIR}/usr/lib
 .endif # ${USE_BITCODE:U} == "no"
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 
 .for _P in ${PROGS} ${PROGS_CXX}					# {
 
@@ -576,7 +576,7 @@
 
 ${OBJS.${_P}} ${LOBJS.${_P}}: ${DPSRCS}
 
-.if defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
+.if defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
 CLEANFILES+= ${_P}.opt.bcl ${_P}.bcl ${_P}.bcl.o
 
 OPTFLAGS.${_P}?= ${OPTFLAGS}
@@ -634,7 +634,7 @@
 	${OBJCOPY} -R .ident ${.TARGET}
 .endif
 .endif	# !commands(${_P})
-.endif  # defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
+.endif  # defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
 .endif	# USE_COMBINE
 
 ${_P}.ro: ${OBJS.${_P}} ${_DPADD.${_P}}
diff --git a/src/share/mk/ubix.shlib.mk b/src/share/mk/ubix.shlib.mk
index bb058c2..4ffdd87 100644
--- a/src/share/mk/ubix.shlib.mk
+++ b/src/share/mk/ubix.shlib.mk
@@ -1,7 +1,7 @@
-#	$NetBSD: bsd.shlib.mk,v 1.8 2012/08/23 21:21:17 joerg Exp $
+#	$UBIXBSD: bsd.shlib.mk,v 1.8 2012/08/23 21:21:17 joerg Exp $
 
-.if !defined(_BSD_SHLIB_MK_)
-_BSD_SHLIB_MK_=1
+.if !defined(_UBIX_SHLIB_MK_)
+_UBIX_SHLIB_MK_=1
 
 .if ${MKDYNAMICROOT} == "no"
 SHLIBINSTALLDIR?= /usr/lib
@@ -37,4 +37,4 @@
 SHLINKDIR?=	/libexec
 .endif
 
-.endif	# !defined(_BSD_SHLIB_MK_)
+.endif	# !defined(_UBIX_SHLIB_MK_)
diff --git a/src/share/mk/ubix.sys.mk b/src/share/mk/ubix.sys.mk
index 6ef2746..f8985d4 100644
--- a/src/share/mk/ubix.sys.mk
+++ b/src/share/mk/ubix.sys.mk
@@ -1,19 +1,19 @@
-.if !defined(_BSD_SYS_MK_)
-_BSD_SYS_MK_=1
+.if !defined(_UBIX_SYS_MK_)
+_UBIX_SYS_MK_=1
 
 .if !empty(.INCLUDEDFROMFILE:MMakefile*)
 error1:
 	@(echo "bsd.sys.mk should not be included from Makefiles" >& 2; exit 1)
 .endif
-.if !defined(_BSD_OWN_MK_)
+.if !defined(_UBIX_OWN_MK_)
 error2:
 	@(echo "bsd.own.mk must be included before bsd.sys.mk" >& 2; exit 1)
 .endif
 
-.if defined(__MINIX)
+.if defined(__UBIX)
 #LSC: Be a bit smarter about the default compiler
-.if exists(/usr/pkg/bin/clang) || exists(/usr/bin/clang)
-CC?=	clang
+.if exists(/usr/pkg/bin/cc) || exists(/usr/bin/cc)
+CC?=	cc
 .endif
 
 .if exists(/usr/pkg/bin/gcc) || exists(/usr/bin/gcc)
@@ -22,15 +22,15 @@
 
 MKDEP?= CC=${CC:Q} mkdep
 MKDEPCXX?= CC=${CXX:Q} mkdep
-.endif # defined(__MINIX)
+.endif # defined(__UBIX)
 
 .if ${MKREPRO:Uno} == "yes"
-CPPFLAGS+=	-Wp,-iremap,${NETBSDSRCDIR}:/usr/src
+CPPFLAGS+=	-Wp,-iremap,${UBIXBSDSRCDIR}:/usr/src
 CPPFLAGS+=	-Wp,-iremap,${DESTDIR}/:/
 CPPFLAGS+=	-Wp,-iremap,${X11SRCDIR}:/usr/xsrc
 .endif
 
-# NetBSD sources use C99 style, with some GCC extensions.
+# UBIXBSD sources use C99 style, with some GCC extensions.
 CFLAGS+=	${${ACTIVE_CC} == "clang":? -std=gnu99 :}
 CFLAGS+=	${${ACTIVE_CC} == "gcc":? -std=gnu99 :}
 CFLAGS+=	${${ACTIVE_CC} == "pcc":? -std=gnu99 :}
@@ -109,9 +109,9 @@
 
 CPPFLAGS+=	${AUDIT:D-D__AUDIT__}
 _NOWERROR=	${defined(NOGCCERROR) || (${ACTIVE_CC} == "clang" && defined(NOCLANGERROR)):?yes:no}
-.if defined(__MINIX) && ${USE_BITCODE:Uno} == "yes"
+.if defined(__UBIX) && ${USE_BITCODE:Uno} == "yes"
 _NOWERROR=	yes
-.endif # defined(__MINIX) && ${USE_BITCODE} == "yes"
+.endif # defined(__UBIX) && ${USE_BITCODE} == "yes"
 CFLAGS+=	${${_NOWERROR} == "no" :?-Werror:} ${CWARNFLAGS}
 LINTFLAGS+=	${DESTDIR:D-d ${DESTDIR}/usr/include}
 
@@ -282,4 +282,4 @@
 .endif
 OBJCOPYLIBFLAGS?=${"${.TARGET:M*.po}" != "":?-X:-x} ${OBJCOPYLIBFLAGS_EXTRA}
 
-.endif	# !defined(_BSD_SYS_MK_)
+.endif	# !defined(_UBIX_SYS_MK_)