diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index 0dd52d4..6dd779f 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -114,7 +114,10 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_OPENBSD_BASEUTILS_DEPENDS:="musl_compat"};
 : ${PKG_OPENBSD_BASEUTILS_URLS_GIT:="baseutils=https://github.com/ibara/baseutils.git@master"};
 : ${PKG_OPENBSD_BASEUTILS_BUILD_DIR:=baseutils};
-: ${PKG_OPENBSD_BASEUTILS_ENV_VARS_EXTRA:="MANDIR=${PREFIX_NATIVE}/share/man"};
+: ${PKG_OPENBSD_BASEUTILS_BUILD_STEPS_DISABLE:=install_make};
+: ${PKG_OPENBSD_BASEUTILS_CFLAGS_BUILD:="${NATIVE_PACKAGES_CFLAGS_CONFIGURE}"};
+: ${PKG_OPENBSD_BASEUTILS_INSTALL_FILES:="../baseutils/pax/pax=bin/ ../baseutils/pax/cpio.1=share/man/man1/ ../baseutils/pax/pax.1=share/man/man1/ ../baseutils/pax/tar.1=share/man/man1/"};
+: ${PKG_OPENBSD_BASEUTILS_MAKE_SUBDIRS:="libopenbsd pax"};
 : ${PKG_PV_SHA256SUM:=608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1};
 : ${PKG_PV_VERSION:=1.6.6};
 : ${PKG_PV_URL:=https://www.ivarch.com/programs/sources/pv-${PKG_PV_VERSION}.tar.bz2};
diff --git a/patches/openbsd_baseutils.local.patch b/patches/openbsd_baseutils.local.patch
index e41f569..2e8600c 100644
--- a/patches/openbsd_baseutils.local.patch
+++ b/patches/openbsd_baseutils.local.patch
@@ -11,8 +11,17 @@ index be8d065..41ffd57 100644
  	if (fd == -1) {
  		if (!in_sig)
  			syswarn(1, errno, "Unable to restore mode and times"
---- baseutils/pax/Makefile.orig	2020-01-28 21:00:25.410023800 +0100
-+++ baseutils/pax/Makefile	2020-01-28 21:01:19.691416800 +0100
+--- baseutils/pax/Makefile.orig	2020-05-24 11:18:45.017286972 +0100
++++ baseutils/pax/Makefile	2020-06-02 09:56:05.077777147 +0100
+@@ -2,7 +2,7 @@
+ 
+ CC ?=		cc
+ CFLAGS ?=	-O2 -pipe
+-CFLAGS +=	-I../libopenbsd -include openbsd.h
++override CFLAGS +=	-I../libopenbsd -include openbsd.h
+ 
+ LIBS =	../libopenbsd/libopenbsd.a
+ 
 @@ -18,12 +18,7 @@
  	${CC} ${LDFLAGS} -o ${PROG} ${OBJS} ${LIBS}
  
@@ -27,3 +36,14 @@ index be8d065..41ffd57 100644
  
  clean:
  	rm -f ${PROG} ${OBJS}
+--- baseutils/libopenbsd/Makefile.orig	2020-05-24 11:18:44.985288127 +0100
++++ baseutils/libopenbsd/Makefile	2020-06-02 10:07:01.438320324 +0100
+@@ -2,7 +2,7 @@
+ 
+ CC ?=		cc
+ CFLAGS ?=	-O2 -pipe
+-CFLAGS +=	-I.
++override CFLAGS +=	-I.
+ 
+ LIB =	libopenbsd.a
+ OBJS =	arc4random.o basename.o dirname.o e_atan2.o e_exp.o e_fmod.o e_log.o e_log10.o e_pow.o e_rem_pio2.o e_sqrt.o errc.o fgetln.o \
diff --git a/vars/openbsd_baseutils.vars b/vars/openbsd_baseutils.vars
deleted file mode 100644
index e070c6b..0000000
--- a/vars/openbsd_baseutils.vars
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# set +o errexit -o noglob -o nounset is assumed.
-#
-
-pkg_openbsd_baseutils_build() {
-	if ! make -C "${PKG_BUILD_DIR}/libopenbsd" CC="${DEFAULT_TARGET}-gcc --sysroot=${PREFIX_NATIVE}"\
-	|| ! make -C "${PKG_BUILD_DIR}/pax" CC="${DEFAULT_TARGET}-gcc --sysroot=${PREFIX_NATIVE}"; then
-		return 1;
-	fi;
-};
-
-pkg_openbsd_baseutils_install_make() {
-	make -C "${PKG_BUILD_DIR}/pax" install MANDIR="${PKG_DESTDIR}/share/man" PREFIX="${PKG_DESTDIR}";
-}
-
-# vim:filetype=sh textwidth=0