diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 36b071b5b5de..5230a21e7745 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -14,25 +14,23 @@ COMMENT=	Tools from the ACPI Component Architecture (ACPICA) project
 
 LICENSE=	BSD
 
-MAKE_ARGS=	HOST=_FreeBSD INSTALLFLAGS="${INSTALL_PROGRAM:S/^${INSTALL}//}"
-MAKE_ARGS+=	NOOPT=TRUE
-
 USES=		gmake
-WRKSRC_SUBDIR=	generate/unix
-LFLAGS=		-i -s
 
 # XXX 20130927 broke support for yacc.
 USES+=		bison
-YACC=		bison
-YFLAGS=		-y
+YACC=		${LOCALBASE}/bin/bison
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^CC[[:blank:]]*=.*|CC = ${CC}|' \
-	    -e 's|^INSTALL[[:blank:]]*=.*|INSTALL = ${INSTALL}|g' \
-	    -e 's|^LEX[[:blank:]]*=.*|LEX = ${FLEX}|' \
-	    -e 's|^LFLAGS[[:blank:]]*\+=.*|LFLAGS = ${LFLAGS}|' \
-	    -e 's|^YACC[[:blank:]]*=.*|YACC = ${YACC}|' \
-	    -e 's|^YFLAGS[[:blank:]]*\+=.*|YFLAGS = ${YFLAGS}|' \
-	    ${WRKSRC}/Makefile.config
+ACPICA_TOOLS=	acpibin acpidump acpiexec acpihelp acpinames acpisrc
+ACPICA_TOOLS+=	acpixtract iasl
+
+PLIST_FILES=	${ACPICA_TOOLS:S,^,bin/,}
+WRKSRC_SUBDIR=	generate/unix
+
+MAKE_ARGS=	HOST=_FreeBSD NOOPT=TRUE
+MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${YACC}"
+
+do-install:
+	@${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${WRKSRC}/bin/,} \
+	    ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/sysutils/acpica-tools/pkg-plist b/sysutils/acpica-tools/pkg-plist
deleted file mode 100644
index 3782a8d74160..000000000000
--- a/sysutils/acpica-tools/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/acpibin
-bin/acpidump
-bin/acpiexec
-bin/acpihelp
-bin/acpinames
-bin/acpisrc
-bin/acpixtract
-bin/iasl