diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile
index 90cc9d3f0c6e4..50970767df8d1 100644
--- a/devel/srecord/Makefile
+++ b/devel/srecord/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	srecord
 PORTVERSION=	1.64
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -17,6 +17,8 @@ LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 ALL_TARGET=	all libdir/pkgconfig/srecord.pc
 USES=		ghostscript groff libtool:build
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
+USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -35,15 +37,15 @@ HEADER_DIRS=	input \
 
 OPTIONS_DEFINE=	DOCS
 
+post-build:
+	${STRIP_CMD} ${WRKSRC}/srecord/.libs/libsrecord.so.0.0.0
+
 pre-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
 	${MKDIR} ${HEADER_DIRS:S,^,${STAGEDIR}${PREFIX}/include/${PORTNAME}/,}
 
 post-install:
-	chmod 644 ${STAGEDIR}${PREFIX}/lib/libsrecord.so.0
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsrecord.so.0
-	chmod 444 ${STAGEDIR}${PREFIX}/lib/libsrecord.so.0
 	${INSTALL_DATA} ${WRKSRC}/libdir/pkgconfig/srecord.pc \
 	    ${STAGEDIR}${PREFIX}/libdata/pkgconfig
 
@@ -53,6 +55,6 @@ test:
 build-plist:
 	${RM} ${PLIST}
 	${MAKE} makeplist | \
-	    ${GREP} -v /you/have/to/check/what/makeplist/gives/you >> ${PLIST}
+	    ${GREP} -v you/have/to/check/what/makeplist/gives/you >> ${PLIST}
 
 .include <bsd.port.mk>
diff --git a/devel/srecord/files/patch-Makefile.in b/devel/srecord/files/patch-Makefile.in
index 95c682e32163f..a98575d8d45c2 100644
--- a/devel/srecord/files/patch-Makefile.in
+++ b/devel/srecord/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig
+--- Makefile.in.orig	2014-06-22 05:31:46 UTC
 +++ Makefile.in
-@@ -4594,7 +4594,7 @@
+@@ -4594,7 +4594,7 @@ install-include: $(includedir)/srecord/adler16.h \
  # to install the *.a and *.so* files as well, which is why you don't see them
  # explicitly mentioned here.
  #
diff --git a/devel/srecord/pkg-plist b/devel/srecord/pkg-plist
index 208ad8d83e2a2..76f217a332495 100644
--- a/devel/srecord/pkg-plist
+++ b/devel/srecord/pkg-plist
@@ -145,55 +145,55 @@ lib/libsrecord.so
 lib/libsrecord.so.0
 lib/libsrecord.so.0.0.0
 libdata/pkgconfig/srecord.pc
-man/man1/srec_cat.1.gz
-man/man1/srec_cmp.1.gz
-man/man1/srec_examples.1.gz
-man/man1/srec_info.1.gz
-man/man1/srec_input.1.gz
-man/man1/srec_license.1.gz
-man/man3/srecord.3.gz
-man/man3/srecord_license.3.gz
-man/man5/srec_aomf.5.gz
-man/man5/srec_ascii_hex.5.gz
-man/man5/srec_atmel_generic.5.gz
-man/man5/srec_binary.5.gz
-man/man5/srec_brecord.5.gz
-man/man5/srec_coe.5.gz
-man/man5/srec_cosmac.5.gz
-man/man5/srec_dec_binary.5.gz
-man/man5/srec_emon52.5.gz
-man/man5/srec_fairchild.5.gz
-man/man5/srec_fastload.5.gz
-man/man5/srec_formatted_binary.5.gz
-man/man5/srec_forth.5.gz
-man/man5/srec_fpc.5.gz
-man/man5/srec_idt.5.gz
-man/man5/srec_intel.5.gz
-man/man5/srec_intel16.5.gz
-man/man5/srec_logisim.5.gz
-man/man5/srec_mem.5.gz
-man/man5/srec_mif.5.gz
-man/man5/srec_mips_flash.5.gz
-man/man5/srec_mos_tech.5.gz
-man/man5/srec_motorola.5.gz
-man/man5/srec_msbin.5.gz
-man/man5/srec_needham.5.gz
-man/man5/srec_os65v.5.gz
-man/man5/srec_ppb.5.gz
-man/man5/srec_ppx.5.gz
-man/man5/srec_signetics.5.gz
-man/man5/srec_spasm.5.gz
-man/man5/srec_spectrum.5.gz
-man/man5/srec_stewie.5.gz
-man/man5/srec_tektronix.5.gz
-man/man5/srec_tektronix_extended.5.gz
-man/man5/srec_ti_tagged.5.gz
-man/man5/srec_ti_tagged_16.5.gz
-man/man5/srec_ti_txt.5.gz
-man/man5/srec_trs80.5.gz
-man/man5/srec_vmem.5.gz
-man/man5/srec_wilson.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/BUILDING.pdf
 %%PORTDOCS%%%%DOCSDIR%%/README.pdf
 %%PORTDOCS%%%%DOCSDIR%%/change_log.pdf
 %%PORTDOCS%%%%DOCSDIR%%/reference.pdf
+share/man/man1/srec_cat.1.gz
+share/man/man1/srec_cmp.1.gz
+share/man/man1/srec_examples.1.gz
+share/man/man1/srec_info.1.gz
+share/man/man1/srec_input.1.gz
+share/man/man1/srec_license.1.gz
+share/man/man3/srecord.3.gz
+share/man/man3/srecord_license.3.gz
+share/man/man5/srec_aomf.5.gz
+share/man/man5/srec_ascii_hex.5.gz
+share/man/man5/srec_atmel_generic.5.gz
+share/man/man5/srec_binary.5.gz
+share/man/man5/srec_brecord.5.gz
+share/man/man5/srec_coe.5.gz
+share/man/man5/srec_cosmac.5.gz
+share/man/man5/srec_dec_binary.5.gz
+share/man/man5/srec_emon52.5.gz
+share/man/man5/srec_fairchild.5.gz
+share/man/man5/srec_fastload.5.gz
+share/man/man5/srec_formatted_binary.5.gz
+share/man/man5/srec_forth.5.gz
+share/man/man5/srec_fpc.5.gz
+share/man/man5/srec_idt.5.gz
+share/man/man5/srec_intel.5.gz
+share/man/man5/srec_intel16.5.gz
+share/man/man5/srec_logisim.5.gz
+share/man/man5/srec_mem.5.gz
+share/man/man5/srec_mif.5.gz
+share/man/man5/srec_mips_flash.5.gz
+share/man/man5/srec_mos_tech.5.gz
+share/man/man5/srec_motorola.5.gz
+share/man/man5/srec_msbin.5.gz
+share/man/man5/srec_needham.5.gz
+share/man/man5/srec_os65v.5.gz
+share/man/man5/srec_ppb.5.gz
+share/man/man5/srec_ppx.5.gz
+share/man/man5/srec_signetics.5.gz
+share/man/man5/srec_spasm.5.gz
+share/man/man5/srec_spectrum.5.gz
+share/man/man5/srec_stewie.5.gz
+share/man/man5/srec_tektronix.5.gz
+share/man/man5/srec_tektronix_extended.5.gz
+share/man/man5/srec_ti_tagged.5.gz
+share/man/man5/srec_ti_tagged_16.5.gz
+share/man/man5/srec_ti_txt.5.gz
+share/man/man5/srec_trs80.5.gz
+share/man/man5/srec_vmem.5.gz
+share/man/man5/srec_wilson.5.gz