diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 710dd715bf68..b0c18b617600 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -1,80 +1,80 @@
 PORTNAME=	cppcheck
 PORTVERSION=	2.7.5
 PORTREVISION?=	0	# devel/cppcheck-gui
 CATEGORIES=	devel
 
 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT?=	Static analysis of C/C++ code
+COMMENT?=	Tool for static C/C++ code analysis
 WWW=		https://cppcheck.sourceforge.io/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libtinyxml2.so:textproc/tinyxml2
 
 USES=		compiler:c++11-lib cmake:insource tar:bzip2
 USE_GITHUB=	yes
 GH_ACCOUNT=	danmar
 CMAKE_OFF=	USE_BUNDLED_TINYXML2
 
 .if defined(GUI_ONLY)
 COMMENT=		Static analysis of C/C++ code (GUI)
 
 RUN_DEPENDS=		cppcheck:devel/cppcheck
 
 CMAKE_ON+=		BUILD_GUI
 USES+=			qt:5
 USE_QT=			core gui widgets printsupport help qmake_build buildtools_build linguisttools_build
 
 BUILD_WRKSRC=		${WRKSRC}/gui
 INSTALL_WRKSRC=		${WRKSRC}/gui
 
 PLIST=			${PKGDIR}/pkg-plist-gui
 
 PKGNAMESUFFIX=		-gui
 .else
 USES+=			shebangfix
 SHEBANG_FILES=		htmlreport/cppcheck-htmlreport
 
 PORTDATA=		*
 
 OPTIONS_DEFINE=		RULES HTMLREPORT MANPAGES MATCHCOMPILER TEST
 OPTIONS_DEFAULT=	RULES HTMLREPORT MANPAGES MATCHCOMPILER
 OPTIONS_SUB=		yes
 
 RULES_DESC=		User-defined rule support (requires PCRE)
 RULES_CMAKE_BOOL=	HAVE_RULES
 RULES_LIB_DEPENDS=	libpcre.so:devel/pcre
 RULES_USES=		localbase:ldflags
 
 TEST_CMAKE_BOOL=	BUILD_TESTS
 
 HTMLREPORT_DESC=	Install cppcheck-htmlreport
 HTMLREPORT_USES=	python:${PYUSE:C/ /,/W}
 HTMLREPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 HTMLREPORT_PLIST_FILES=	bin/cppcheck-htmlreport
 HTMLREPORT_VARS=	PYUSE+=run
 
 MANPAGES_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
 			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl
 
 MATCHCOMPILER_DESC=	Build-time optimizations via Python
 MATCHCOMPILER_CMAKE_BOOL=	USE_MATCHCOMPILER
 MATCHCOMPILER_USES=	python:${PYUSE:C/ /,/W}
 MATCHCOMPILER_VARS=	PYUSE+=build
 
 post-install-HTMLREPORT-on:
 	${INSTALL_SCRIPT} ${WRKSRC}/htmlreport/cppcheck-htmlreport ${STAGEDIR}${PREFIX}/bin
 
 post-build-MANPAGES-on:
 	cd ${WRKSRC}/man && ${LOCALBASE}/bin/xsltproc --nonet --param man.charmap.use.subset "0" \
 		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl cppcheck.1.xml
 
 post-install-MANPAGES-on:
 	${INSTALL_MAN} ${WRKSRC}/man/cppcheck.1 ${STAGEDIR}${PREFIX}/man/man1
 
 do-test-TEST-on:
 	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ctest
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/cppcheck/pkg-descr b/devel/cppcheck/pkg-descr
index ce7eeeffaed3..ee2175194cf1 100644
--- a/devel/cppcheck/pkg-descr
+++ b/devel/cppcheck/pkg-descr
@@ -1,8 +1,8 @@
-Cppcheck is a tool for static C/C++ code analysis, and it tries to
-detect bugs that your compiler do not see.  Checks for: memory leaks,
-mismatching allocation-deallocation, buffer overrun, and many more.
+Cppcheck is a tool for static C/C++ code analysis. It tries to
+detect bugs that your compiler does not see. It checks for: memory leaks,
+mismatching allocations-deallocations, buffer overruns, and many more.
 
-Cppcheck is versatile.  You can check non-standard code that includes
+Cppcheck is versatile. You can check non-standard code that includes
 various compiler extensions, inline assembly code, etc.
 
-The goal is no false positives.
+The goal is to have no false positives.