diff --git a/misc/lastools/Makefile b/misc/lastools/Makefile
index acf11a6513ca..b31b5319cce1 100644
--- a/misc/lastools/Makefile
+++ b/misc/lastools/Makefile
@@ -1,29 +1,32 @@
 PORTNAME=	LAStools
 DISTVERSION=	2.0.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
 DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Efficient tools for LiDAR processing
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.txt
 
-USES=		cmake zip
+USES=		cmake:insource zip
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
+CONFLICTS_INSTALL=	liblas
+
 EXECUTABLES=	lasindex las2txt las2las txt2las lasdiff lasinfo laszip lasmerge lasprecision
 
-post-configure: # workaround for https://github.com/LAStools/LAStools/issues/108
-	@${REINPLACE_CMD} -e '/laslib-config.cmake/,1d' ${BUILD_WRKSRC}/LASlib/src/cmake_install.cmake
+pre-install:
+	${MV} ${WRKSRC}/LASlib/src/LASlib-config.cmake ${WRKSRC}/LASlib/src/laslib-config.cmake
 
 post-install: # install executables, workaround for https://github.com/LAStools/LAStools/issues/120
 .for e in ${EXECUTABLES}
 	${INSTALL_PROGRAM} ${STAGEDIR}${PREFIX}/bin/${e}64 ${STAGEDIR}${PREFIX}/bin
 	${MV} ${STAGEDIR}${PREFIX}/bin/${e}64 ${STAGEDIR}${PREFIX}/bin/${e}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/misc/lastools/pkg-plist b/misc/lastools/pkg-plist
index c660fd1bfb54..d27914443675 100644
--- a/misc/lastools/pkg-plist
+++ b/misc/lastools/pkg-plist
@@ -1,84 +1,85 @@
 bin/las2las
 bin/las2txt
 bin/lasdiff
 bin/lasindex
 bin/lasinfo
 bin/lasmerge
 bin/lasprecision
 bin/laszip
 bin/txt2las
 include/LASlib/arithmeticdecoder.hpp
 include/LASlib/arithmeticencoder.hpp
 include/LASlib/arithmeticmodel.hpp
 include/LASlib/bytestreamin.hpp
 include/LASlib/bytestreamin_array.hpp
 include/LASlib/bytestreamin_file.hpp
 include/LASlib/bytestreamin_istream.hpp
 include/LASlib/bytestreaminout.hpp
 include/LASlib/bytestreaminout_file.hpp
 include/LASlib/bytestreamout.hpp
 include/LASlib/bytestreamout_array.hpp
 include/LASlib/bytestreamout_file.hpp
 include/LASlib/bytestreamout_nil.hpp
 include/LASlib/bytestreamout_ostream.hpp
 include/LASlib/integercompressor.hpp
 include/LASlib/lasattributer.hpp
 include/LASlib/lasdefinitions.hpp
 include/LASlib/lasfilter.hpp
 include/LASlib/lasignore.hpp
 include/LASlib/lasindex.hpp
 include/LASlib/lasinterval.hpp
 include/LASlib/laskdtree.hpp
 include/LASlib/laspoint.hpp
 include/LASlib/lasquadtree.hpp
 include/LASlib/lasquantizer.hpp
 include/LASlib/lasreader.hpp
 include/LASlib/lasreader_asc.hpp
 include/LASlib/lasreader_bil.hpp
 include/LASlib/lasreader_bin.hpp
 include/LASlib/lasreader_dtm.hpp
 include/LASlib/lasreader_las.hpp
 include/LASlib/lasreader_ply.hpp
 include/LASlib/lasreader_qfit.hpp
 include/LASlib/lasreader_shp.hpp
 include/LASlib/lasreader_txt.hpp
 include/LASlib/lasreaderbuffered.hpp
 include/LASlib/lasreadermerged.hpp
 include/LASlib/lasreaderpipeon.hpp
 include/LASlib/lasreaderstored.hpp
 include/LASlib/lasreaditem.hpp
 include/LASlib/lasreaditemcompressed_v1.hpp
 include/LASlib/lasreaditemcompressed_v2.hpp
 include/LASlib/lasreaditemcompressed_v3.hpp
 include/LASlib/lasreaditemcompressed_v4.hpp
 include/LASlib/lasreaditemraw.hpp
 include/LASlib/lasreadpoint.hpp
 include/LASlib/lastransform.hpp
 include/LASlib/lasutility.hpp
 include/LASlib/lasvlr.hpp
 include/LASlib/lasvlrpayload.hpp
 include/LASlib/laswaveform13reader.hpp
 include/LASlib/laswaveform13writer.hpp
 include/LASlib/laswriteitem.hpp
 include/LASlib/laswriteitemcompressed_v1.hpp
 include/LASlib/laswriteitemcompressed_v2.hpp
 include/LASlib/laswriteitemcompressed_v3.hpp
 include/LASlib/laswriteitemcompressed_v4.hpp
 include/LASlib/laswriteitemraw.hpp
 include/LASlib/laswritepoint.hpp
 include/LASlib/laswriter.hpp
 include/LASlib/laswriter_bin.hpp
 include/LASlib/laswriter_las.hpp
 include/LASlib/laswriter_qfit.hpp
 include/LASlib/laswriter_txt.hpp
 include/LASlib/laswriter_wrl.hpp
 include/LASlib/laswritercompatible.hpp
 include/LASlib/laszip.hpp
 include/LASlib/laszip_common_v1.hpp
 include/LASlib/laszip_common_v2.hpp
 include/LASlib/laszip_common_v3.hpp
 include/LASlib/laszip_decompress_selective_v3.hpp
 include/LASlib/mydefs.hpp
 lib/LASlib/libLASlib.so
+lib/cmake/LASlib/laslib-config.cmake
 lib/cmake/LASlib/laslib-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/LASlib/laslib-targets.cmake