diff --git a/textproc/tidyp/Makefile b/textproc/tidyp/Makefile
index 223f3ead1c45..902657fc84e1 100644
--- a/textproc/tidyp/Makefile
+++ b/textproc/tidyp/Makefile
@@ -13,40 +13,18 @@ COMMENT=	Library and program to validate and fix HTML
 
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-USES=		libtool
 USE_LDCONFIG=	yes
+USES=		libtool
 
 OPTIONS_DEFINE=	ACCESS ASIAN DEBUG UTF16
 ACCESS_DESC=	Accessibility checks
 ASIAN_DESC=	Asian encodings
 
-PLIST_FILES=	bin/${PORTNAME} \
-		include/${PORTNAME}/buffio.h \
-		include/${PORTNAME}/platform.h \
-		include/${PORTNAME}/tidyp.h \
-		include/${PORTNAME}/tidypenum.h \
-		lib/lib${PORTNAME}-${PORTVERSION}.so.0 \
-		lib/lib${PORTNAME}-${PORTVERSION}.so.0.0.0 \
-		lib/lib${PORTNAME}.a \
-		lib/lib${PORTNAME}.so
-PLIST_DIRS=	include/${PORTNAME}
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MACCESS}
-CONFIGURE_ARGS+=--enable-access
-.endif
-
-.if ${PORT_OPTIONS:MASIAN}
-CONFIGURE_ARGS+=--enable-asian
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=--enable-debug
-.endif
-
-.if ${PORT_OPTIONS:MUTF16}
-CONFIGURE_ARGS+=--enable-utf16
-.endif
+ACCESS_CONFIGURE_ENABLE=access
+ASIAN_CONFIGURE_ENABLE=	asian
+DEBUG_CONFIGURE_ENABLE=	debug
+UTF16_CONFIGURE_ENABLE=	utf16
 
 .include <bsd.port.mk>
diff --git a/textproc/tidyp/pkg-plist b/textproc/tidyp/pkg-plist
new file mode 100644
index 000000000000..3c898e1fadbb
--- /dev/null
+++ b/textproc/tidyp/pkg-plist
@@ -0,0 +1,10 @@
+bin/tidyp
+include/tidyp/buffio.h
+include/tidyp/platform.h
+include/tidyp/tidyp.h
+include/tidyp/tidypenum.h
+lib/libtidyp-%%PORTVERSION%%.so.0
+lib/libtidyp-%%PORTVERSION%%.so.0.0.0
+lib/libtidyp.a
+lib/libtidyp.so
+@dirrm include/tidyp