diff --git a/devel/freebsd-nvme-shim/Makefile b/devel/freebsd-nvme-shim/Makefile
index 7919c42b3a23..e93646964d83 100644
--- a/devel/freebsd-nvme-shim/Makefile
+++ b/devel/freebsd-nvme-shim/Makefile
@@ -1,21 +1,27 @@
 PORTNAME=	freebsd-nvme-shim
-PORTVERSION=	1.0.1
+DISTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	FreeBSD implementations of Linux headers
 WWW=		https://github.com/bsdimp/freebsd-nvme-shim
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bsdimp
-GH_TAGNAME=	freebsd-1.0.1
+GH_TAGNAME=	freebsd-${DISTVERSION}
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 
 do-install:
 	(cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/${PORTNAME})
 
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/include/${PORTNAME}/COPYRIGHT
+	${RM} ${STAGEDIR}${PREFIX}/include/${PORTNAME}/NOTES
+
 .include <bsd.port.mk>
diff --git a/devel/freebsd-nvme-shim/pkg-plist b/devel/freebsd-nvme-shim/pkg-plist
index 60d48fcff0a2..de592ceea519 100644
--- a/devel/freebsd-nvme-shim/pkg-plist
+++ b/devel/freebsd-nvme-shim/pkg-plist
@@ -1,19 +1,17 @@
-include/freebsd-nvme-shim/COPYRIGHT
-include/freebsd-nvme-shim/NOTES
 include/freebsd-nvme-shim/asm/bitsperlong.h
 include/freebsd-nvme-shim/asm/byteorder.h
 include/freebsd-nvme-shim/asm/types.h
 include/freebsd-nvme-shim/elf.h
 include/freebsd-nvme-shim/errno.h
 include/freebsd-nvme-shim/linux/errno.h
 include/freebsd-nvme-shim/linux/fs.h
 include/freebsd-nvme-shim/linux/stddef.h
 include/freebsd-nvme-shim/linux/types.h
 include/freebsd-nvme-shim/netinet6/in6.h
 include/freebsd-nvme-shim/strings.h
 include/freebsd-nvme-shim/sys/elf64.h
 include/freebsd-nvme-shim/sys/elf_common.h
 include/freebsd-nvme-shim/sys/ioctl.h
 include/freebsd-nvme-shim/sys/mman.h
 include/freebsd-nvme-shim/sys/sysinfo.h
 include/freebsd-nvme-shim/time.h