diff --git a/devel/srecord/Makefile b/devel/srecord/Makefile
index 90cc9d3f0c6e..50970767df8d 100644
--- a/devel/srecord/Makefile
+++ b/devel/srecord/Makefile
@@ -1,58 +1,60 @@
 PORTNAME=	srecord
 PORTVERSION=	1.64
-PORTREVISION=	19
+PORTREVISION=	20
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
 MAINTAINER=	brooks@FreeBSD.org
 COMMENT=	Collection of powerful tools for manipulating EPROM load files
 WWW=		https://srecord.sourceforge.net/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 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
 
 HEADER_DIRS=	input \
 		input/file \
 		input/filter \
 		input/filter/checksum \
 		input/filter/interval \
 		input/filter/message \
 		input/generator \
 		memory \
 		memory/walker \
 		output \
 		output/file \
 		quit
 
 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
 
 test:
 	@cd ${WRKSRC} && ${MAKE} sure
 
 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 95c682e32163..a98575d8d45c 100644
--- a/devel/srecord/files/patch-Makefile.in
+++ b/devel/srecord/files/patch-Makefile.in
@@ -1,11 +1,11 @@
---- 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.
  #
 -install-libdir: $(libdir)/libsrecord.la $(libdir)/pkgconfig/srecord.pc
 +install-libdir: $(libdir)/libsrecord.la
  
  install-man: $(mandir)/man1/srec_cat.1 $(mandir)/man1/srec_cmp.1 \
  		$(mandir)/man1/srec_examples.1 $(mandir)/man1/srec_info.1 \
diff --git a/devel/srecord/pkg-plist b/devel/srecord/pkg-plist
index 208ad8d83e2a..76f217a33249 100644
--- a/devel/srecord/pkg-plist
+++ b/devel/srecord/pkg-plist
@@ -1,199 +1,199 @@
 bin/srec_cat
 bin/srec_cmp
 bin/srec_info
 include/srecord/adler16.h
 include/srecord/adler32.h
 include/srecord/crc16.h
 include/srecord/crc32.h
 include/srecord/defcon.h
 include/srecord/endian.h
 include/srecord/fletcher16.h
 include/srecord/fletcher32.h
 include/srecord/format_printf.h
 include/srecord/input.h
 include/srecord/input/catenate.h
 include/srecord/input/file.h
 include/srecord/input/file/aomf.h
 include/srecord/input/file/ascii_hex.h
 include/srecord/input/file/atmel_generic.h
 include/srecord/input/file/binary.h
 include/srecord/input/file/brecord.h
 include/srecord/input/file/cosmac.h
 include/srecord/input/file/dec_binary.h
 include/srecord/input/file/emon52.h
 include/srecord/input/file/fairchild.h
 include/srecord/input/file/fastload.h
 include/srecord/input/file/formatted_binary.h
 include/srecord/input/file/four_packed_code.h
 include/srecord/input/file/intel.h
 include/srecord/input/file/logisim.h
 include/srecord/input/file/mif.h
 include/srecord/input/file/mips_flash.h
 include/srecord/input/file/mos_tech.h
 include/srecord/input/file/msbin.h
 include/srecord/input/file/needham.h
 include/srecord/input/file/os65v.h
 include/srecord/input/file/ppb.h
 include/srecord/input/file/ppx.h
 include/srecord/input/file/signetics.h
 include/srecord/input/file/spasm.h
 include/srecord/input/file/spectrum.h
 include/srecord/input/file/stewie.h
 include/srecord/input/file/tektronix.h
 include/srecord/input/file/tektronix_extended.h
 include/srecord/input/file/ti_tagged.h
 include/srecord/input/file/ti_tagged_16.h
 include/srecord/input/file/ti_txt.h
 include/srecord/input/file/trs80.h
 include/srecord/input/file/vmem.h
 include/srecord/input/file/wilson.h
 include/srecord/input/filter.h
 include/srecord/input/filter/and.h
 include/srecord/input/filter/bitrev.h
 include/srecord/input/filter/byte_swap.h
 include/srecord/input/filter/checksum.h
 include/srecord/input/filter/checksum/bitnot.h
 include/srecord/input/filter/checksum/negative.h
 include/srecord/input/filter/checksum/positive.h
 include/srecord/input/filter/crop.h
 include/srecord/input/filter/fill.h
 include/srecord/input/filter/interval.h
 include/srecord/input/filter/interval/length.h
 include/srecord/input/filter/interval/maximum.h
 include/srecord/input/filter/interval/minimum.h
 include/srecord/input/filter/message.h
 include/srecord/input/filter/message/adler16.h
 include/srecord/input/filter/message/adler32.h
 include/srecord/input/filter/message/crc16.h
 include/srecord/input/filter/message/crc32.h
 include/srecord/input/filter/message/fletcher16.h
 include/srecord/input/filter/message/fletcher32.h
 include/srecord/input/filter/message/gcrypt.h
 include/srecord/input/filter/not.h
 include/srecord/input/filter/offset.h
 include/srecord/input/filter/or.h
 include/srecord/input/filter/random_fill.h
 include/srecord/input/filter/sequence.h
 include/srecord/input/filter/split.h
 include/srecord/input/filter/unfill.h
 include/srecord/input/filter/unsplit.h
 include/srecord/input/filter/xor.h
 include/srecord/input/generator.h
 include/srecord/input/generator/constant.h
 include/srecord/input/generator/random.h
 include/srecord/input/generator/repeat.h
 include/srecord/interval.h
 include/srecord/memory.h
 include/srecord/memory/chunk.h
 include/srecord/memory/walker.h
 include/srecord/memory/walker/compare.h
 include/srecord/memory/walker/continuity.h
 include/srecord/memory/walker/gcrypt.h
 include/srecord/memory/walker/writer.h
 include/srecord/output.h
 include/srecord/output/file.h
 include/srecord/output/file/aomf.h
 include/srecord/output/file/ascii_hex.h
 include/srecord/output/file/asm.h
 include/srecord/output/file/atmel_generic.h
 include/srecord/output/file/basic.h
 include/srecord/output/file/binary.h
 include/srecord/output/file/brecord.h
 include/srecord/output/file/c.h
 include/srecord/output/file/cosmac.h
 include/srecord/output/file/dec_binary.h
 include/srecord/output/file/emon52.h
 include/srecord/output/file/fairchild.h
 include/srecord/output/file/fastload.h
 include/srecord/output/file/formatted_binary.h
 include/srecord/output/file/forth.h
 include/srecord/output/file/four_packed_code.h
 include/srecord/output/file/hexdump.h
 include/srecord/output/file/intel.h
 include/srecord/output/file/intel16.h
 include/srecord/output/file/logisim.h
 include/srecord/output/file/mif.h
 include/srecord/output/file/mips_flash.h
 include/srecord/output/file/mos_tech.h
 include/srecord/output/file/msbin.h
 include/srecord/output/file/needham.h
 include/srecord/output/file/os65v.h
 include/srecord/output/file/ppb.h
 include/srecord/output/file/ppx.h
 include/srecord/output/file/signetics.h
 include/srecord/output/file/spasm.h
 include/srecord/output/file/spectrum.h
 include/srecord/output/file/stewie.h
 include/srecord/output/file/tektronix.h
 include/srecord/output/file/tektronix_extended.h
 include/srecord/output/file/ti_tagged.h
 include/srecord/output/file/ti_tagged_16.h
 include/srecord/output/file/ti_txt.h
 include/srecord/output/file/trs80.h
 include/srecord/output/file/vhdl.h
 include/srecord/output/file/vmem.h
 include/srecord/output/file/wilson.h
 include/srecord/quit.h
 include/srecord/quit/exception.h
 include/srecord/quit/normal.h
 include/srecord/quit/prefix.h
 include/srecord/record.h
 include/srecord/srecord.h
 include/srecord/string.h
 lib/libsrecord.a
 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