diff --git a/devel/check/Makefile b/devel/check/Makefile
index a6e3d4b9c3e0..f8940b1b675c 100644
--- a/devel/check/Makefile
+++ b/devel/check/Makefile
@@ -2,9 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	check
-PORTVERSION=	0.15.2
+DISTVERSION=	0.15.2
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/libcheck/check/releases/download/${PORTVERSION}/
+MASTER_SITES=	https://github.com/libcheck/check/releases/download/${DISTVERSION}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Unit test framework for C
@@ -12,25 +13,16 @@ COMMENT=	Unit test framework for C
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
-USES=		libtool makeinfo pathfix pkgconfig
-
-CONFIGURE_ENV=	ac_cv_path_AWK_PATH=${AWK}
-GNU_CONFIGURE=	yes
-INSTALL_TARGET=	install-strip
+USES=		cmake
 USE_LDCONFIG=	yes
 
-INFO=		check
+TEST_TARGET=	test
+
+CMAKE_ARGS=	-DCMAKE_INSTALL_DATAROOTDIR:PATH=./ \
+		-DENABLE_MEMORY_LEAKING_TESTS:BOOL=false
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	TEST
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e 's|COPYING.LESSER||' \
-		-e '/^docdir = / s|$$(PACKAGE)|check|' \
-			${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} \
-		-e '/^exampledir = / s|(docdir)/example|(datadir)/examples/check|' \
-		-e '/^example[a-z]*dir = / s|(docdir)/example/|(exampledir)/|' \
-			${WRKSRC}/doc/Makefile.in
+TEST_CMAKE_BOOL=	BUILD_TESTING CHECK_ENABLE_TESTS
 
 .include <bsd.port.mk>
diff --git a/devel/check/pkg-plist b/devel/check/pkg-plist
index c57bf6bf2fb3..4df4a534420b 100644
--- a/devel/check/pkg-plist
+++ b/devel/check/pkg-plist
@@ -1,34 +1,13 @@
 bin/checkmk
 include/check.h
 include/check_stdint.h
+lib/cmake/check/check-config-version.cmake
+lib/cmake/check/check-config.cmake
+lib/cmake/check/check-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/check/check-targets.cmake
 lib/libcheck.a
 lib/libcheck.so
 lib/libcheck.so.0
-lib/libcheck.so.0.0.0
+lib/libcheck.so.0.15.2
 libdata/pkgconfig/check.pc
 man/man1/checkmk.1.gz
-share/aclocal/check.m4
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.am
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/configure.ac
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/Makefile.am
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/main.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.1.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.2.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.3.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.4.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.5.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.6.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/src/money.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/Makefile.am
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.1.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.3.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.6.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.7.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tests/check_money.c