diff --git a/security/cardpeek/Makefile b/security/cardpeek/Makefile
index c8cf5f519691..55c2e428bf04 100644
--- a/security/cardpeek/Makefile
+++ b/security/cardpeek/Makefile
@@ -1,33 +1,30 @@
 PORTNAME=	cardpeek
 PORTVERSION=	0.8.4
 PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://downloads.pannetrat.com/install/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Tool for reading the contents of ISO 7816 smart cards
 WWW=		http://pannetrat.com/Cardpeek/
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpcsclite.so:devel/pcsc-lite \
 		libcurl.so:ftp/curl
 RUN_DEPENDS=	pcscd:devel/pcsc-lite
 
 USES=		gnome iconv localbase lua:52 pkgconfig
 USE_GNOME=	gtk30
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 
-PLIST_FILES=	bin/cardpeek man/man1/cardpeek.1.gz \
+PLIST_FILES=	bin/cardpeek share/man/man1/cardpeek.1.gz \
 		share/appdata/cardpeek.appdata.xml \
 		share/applications/cardpeek.desktop \
 		share/icons/hicolor/48x48/apps/cardpeek-logo.png
 PORTDOCS=	AUTHORS README cardpeek_ref.en.pdf
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,^doc_DATA =,& AUTHORS README,' \
-		${WRKSRC}/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/security/cardpeek/files/patch-Makefile.in b/security/cardpeek/files/patch-Makefile.in
new file mode 100644
index 000000000000..9f6676d6b5c8
--- /dev/null
+++ b/security/cardpeek/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2015-02-27 14:24:48 UTC
++++ Makefile.in
+@@ -435,7 +435,7 @@ cardpeek_SOURCES = asn1.c asn1.h bytestring.c bytestri
+ 	cardpeek_public_key.h win32/config.h $(am__append_1) \
+ 	$(am__append_3)
+ EXTRA_cardpeek_SOURCES = cardpeek.c osx/cardpeek-osx.m
+-doc_DATA = doc/cardpeek_ref.en.pdf 
++doc_DATA = AUTHORS README doc/cardpeek_ref.en.pdf
+ cardpeek_LDADD = cardpeek_resources.$(OBJEXT) @LUA_LIBS@ @PCSC_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @CURL_LIBS@ @ICONV_LIBS@
+ cardpeek_LDFLAGS = -g $(am__append_2)
+ dist_man_MANS = cardpeek.1
+@@ -595,7 +595,7 @@ osx/cardpeek-osx.$(OBJEXT): osx/$(am__dirstamp) \
+ 
+ cardpeek$(EXEEXT): $(cardpeek_OBJECTS) $(cardpeek_DEPENDENCIES) $(EXTRA_cardpeek_DEPENDENCIES) 
+ 	@rm -f cardpeek$(EXEEXT)
+-	$(AM_V_OBJCLD)$(cardpeek_LINK) $(cardpeek_OBJECTS) $(cardpeek_LDADD) $(LIBS)
++	$(AM_V_CCLD)$(LINK) $(cardpeek_OBJECTS) $(cardpeek_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)