diff --git a/textproc/luceneplusplus/Makefile b/textproc/luceneplusplus/Makefile
index 4d39574bb677..af028a043668 100644
--- a/textproc/luceneplusplus/Makefile
+++ b/textproc/luceneplusplus/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	lucene++
 PORTVERSION=	3.0.8
+PORTREVISION=	1
 DISTVERSIONPREFIX=	rel_
 CATEGORIES=	textproc
 
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	C++ port of the Lucene library
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/LGPL.license
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	luceneplusplus
 GH_PROJECT=	LucenePlusPlus
 USES=		cmake compiler:c++11-lang
 USE_LDCONFIG=	yes
 CMAKE_OFF=	ENABLE_TEST ENABLE_DEMO
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	${REINPLACE_CMD} "/cotire/d" ${WRKSRC}/src/contrib/CMakeLists.txt \
 		${WRKSRC}/src/core/CMakeLists.txt \
 		${WRKSRC}/src/test/CMakeLists.txt
 	${REINPLACE_CMD} 's,include/pkgconfig,libdata/pkgconfig,;s,include/cmake,share/lucene++/cmake,' \
 		${WRKSRC}/src/config/core/CMakeLists.txt \
 		${WRKSRC}/src/config/contrib/CMakeLists.txt
 
 .include <bsd.port.post.mk>
diff --git a/textproc/luceneplusplus/files/patch-src_config_contrib_liblucene++-contrib.pc.in b/textproc/luceneplusplus/files/patch-src_config_contrib_liblucene++-contrib.pc.in
new file mode 100644
index 000000000000..8d1620d8c5d6
--- /dev/null
+++ b/textproc/luceneplusplus/files/patch-src_config_contrib_liblucene++-contrib.pc.in
@@ -0,0 +1,18 @@
+--- src/config/contrib/liblucene++-contrib.pc.in.orig
++++ src/config/contrib/liblucene++-contrib.pc.in
+@@ -1,13 +1,12 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}/bin
+-libdir=@LIB_DESTINATION@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include/lucene++
+ lib=lucene++-contrib
+ 
+ Name: liblucene++-contrib
+ Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene
+ Version: @lucene++_VERSION@
+-Libs: -L@LIB_DESTINATION@ -l${lib}
++Libs: -L${libdir} -l${lib}
+ Cflags: -I${includedir}
+ Requires: liblucene++ = @lucene++_VERSION@
+-
diff --git a/textproc/luceneplusplus/files/patch-src_config_core_liblucene++.pc.in b/textproc/luceneplusplus/files/patch-src_config_core_liblucene++.pc.in
new file mode 100644
index 000000000000..2bfc591d47c3
--- /dev/null
+++ b/textproc/luceneplusplus/files/patch-src_config_core_liblucene++.pc.in
@@ -0,0 +1,17 @@
+--- src/config/core/liblucene++.pc.in.orig
++++ src/config/core/liblucene++.pc.in
+@@ -1,12 +1,11 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=${prefix}/bin
+-libdir=@LIB_DESTINATION@
++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+ includedir=${prefix}/include/lucene++
+ lib=lucene++
+ 
+ Name: liblucene++
+ Description: Lucene++ - a C++ search engine, ported from the popular Apache Lucene
+ Version: @lucene++_VERSION@
+-Libs: -L@LIB_DESTINATION@ -l${lib}
++Libs: -L${libdir} -l${lib}
+ Cflags: -I${includedir}
+-