diff --git a/sysutils/intel-pcm/Makefile b/sysutils/intel-pcm/Makefile
index 44dd81df0da3..fbeed7e09b75 100644
--- a/sysutils/intel-pcm/Makefile
+++ b/sysutils/intel-pcm/Makefile
@@ -1,20 +1,34 @@
 PORTNAME=	intel-pcm
-PORTVERSION=	202210
+DISTVERSION=	202210
 CATEGORIES=	sysutils
 
 MAINTAINER=	imp@FreeBSD.org
 COMMENT=	Process Count Monitor (PCM) for Intel processors
-WWW=		https://github.com/opcm/pcm
+WWW=		https://github.com/intel/pcm
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64 i386
 
-USES=		cmake
+USES=		cmake compiler:c++11-lang
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	opcm
+GH_ACCOUNT=	intel
 GH_PROJECT=	pcm
 
+PORTDOCS=	*
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-O3 -D_FORTIFY_SOURCE=1|-D_FORTIFY_SOURCE=1|g' \
+	    ${PATCH_WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_DATADIR}/pcm|$${CMAKE_INSTALL_DATADIR}/${PORTNAME}|g' \
+	    ${PATCH_WRKSRC}/src/CMakeLists.txt
+	@${REINPLACE_CMD} -e 's|$${CMAKE_INSTALL_DOCDIR}|$${CMAKE_INSTALL_DATADIR}/doc/${PORTNAME}|g' \
+	    ${PATCH_WRKSRC}/src/CMakeLists.txt
+
+post-install:
+	${RM} ${STAGEDIR}${PREFIX}/share/licenses/pcm/LICENSE
+	${RM} -r ${STAGEDIR}${PREFIX}/share/licenses
+
 .include <bsd.port.mk>
diff --git a/sysutils/intel-pcm/distinfo b/sysutils/intel-pcm/distinfo
index 008a7d2ede27..41cf8c267507 100644
--- a/sysutils/intel-pcm/distinfo
+++ b/sysutils/intel-pcm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667861314
-SHA256 (opcm-pcm-202210_GH0.tar.gz) = faec5b7923d0bc0018c090df594b1bf562428a08ab243cbb5c973e4b7ab6b126
-SIZE (opcm-pcm-202210_GH0.tar.gz) = 1088332
+TIMESTAMP = 1667933954
+SHA256 (intel-pcm-202210_GH0.tar.gz) = faec5b7923d0bc0018c090df594b1bf562428a08ab243cbb5c973e4b7ab6b126
+SIZE (intel-pcm-202210_GH0.tar.gz) = 1088332
diff --git a/sysutils/intel-pcm/pkg-plist b/sysutils/intel-pcm/pkg-plist
index 92392d3364cf..83555d40eba1 100644
--- a/sysutils/intel-pcm/pkg-plist
+++ b/sysutils/intel-pcm/pkg-plist
@@ -14,25 +14,12 @@ sbin/pcm-power
 sbin/pcm-raw
 sbin/pcm-sensor
 sbin/pcm-tsx
-share/doc/PCM/CUSTOM-COMPILE-OPTIONS.md
-share/doc/PCM/DOCKER_README.md
-share/doc/PCM/ENVVAR_README.md
-share/doc/PCM/FAQ.md
-share/doc/PCM/FREEBSD_HOWTO.txt
-share/doc/PCM/LINUX_HOWTO.txt
-share/doc/PCM/MAC_HOWTO.txt
-share/doc/PCM/PCM-EXPORTER.md
-share/doc/PCM/PCM-SENSOR-SERVER-README.md
-share/doc/PCM/PCM_RAW_README.md
-share/doc/PCM/README.md
-share/doc/PCM/WINDOWS_HOWTO.md
-share/doc/PCM/license.txt
 share/licenses/pcm/LICENSE
-share/pcm/PMURegisterDeclarations/GenuineIntel-6-55-4.json
-share/pcm/PMURegisterDeclarations/GenuineIntel-6-55-7.json
-share/pcm/PMURegisterDeclarations/GenuineIntel-6-6A-6.json
-share/pcm/PMURegisterDeclarations/GenuineIntel-6-86-5.json
-share/pcm/PMURegisterDeclarations/GenuineIntel-6-8E-C.json
-share/pcm/opCode-106.txt
-share/pcm/opCode-134.txt
-share/pcm/opCode-85.txt
+%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-55-4.json
+%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-55-7.json
+%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-6A-6.json
+%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-86-5.json
+%%DATADIR%%/PMURegisterDeclarations/GenuineIntel-6-8E-C.json
+%%DATADIR%%/opCode-106.txt
+%%DATADIR%%/opCode-134.txt
+%%DATADIR%%/opCode-85.txt