diff --git a/sysutils/memgrep/Makefile b/sysutils/memgrep/Makefile
index 326ec485b1fb..8094d966a822 100644
--- a/sysutils/memgrep/Makefile
+++ b/sysutils/memgrep/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	memgrep
-PORTVERSION=	0.7.0
+PORTVERSION=	0.8.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.hick.org/code/skape/memgrep/
 
@@ -15,13 +15,29 @@ COMMENT=	Utility to manipulate memory from running processes and core files
 
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+USE_REINPLACE=	yes
 
 ONLY_FOR_ARCHS=	i386
 
+PORTDOCS=	annotated.html doxygen.css doxygen.png examples.html files.html \
+		functions.html group__memgrep.html index.html memgrep_8h-source.html \
+		modules.html simple_8c-example.html  struct__core__memory__sections.html \
+		struct__mem__ctx.html struct__mem__ctx__core__data.html \
+		struct__memgrep__functions.html struct__memgrep__result.html\
+		struct__memgrep__result__row.html struct__memgrep__result__row__dump.html \
+		struct__memgrep__result__row__heap.html \
+		struct__memgrep__result__row__replace.html \
+		struct__memgrep__result__row__search.html struct__process__section__addrs.html
+
+post-patch:
+		@${REINPLACE_CMD} "s,-O3,,;s,FLAGS=,FLAGS+=," ${WRKSRC}/src/Makefile.in ${WRKSRC}/examples/Makefile.in
+
+MAKE_ENV+=	FLAGS="${CFLAGS}"
+
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/html
-	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}/html
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/memgrep/distinfo b/sysutils/memgrep/distinfo
index 2741430dcf50..0560564b3452 100644
--- a/sysutils/memgrep/distinfo
+++ b/sysutils/memgrep/distinfo
@@ -1 +1 @@
-MD5 (memgrep-0.7.0.tar.gz) = 935787217d081c54b7f9ed9100bb7ab6
+MD5 (memgrep-0.8.0.tar.gz) = b52da1eb88313206fd8ced1db9df1830
diff --git a/sysutils/memgrep/files/patch-Makefile.in b/sysutils/memgrep/files/patch-Makefile.in
index 5dc89213b299..97734df39d45 100644
--- a/sysutils/memgrep/files/patch-Makefile.in
+++ b/sysutils/memgrep/files/patch-Makefile.in
@@ -1,17 +1,26 @@
---- Makefile.in.orig	Sat Feb 22 00:41:31 2003
-+++ Makefile.in	Sat Feb 22 14:04:54 2003
-@@ -6,13 +6,13 @@
+--- Makefile.in.orig	Tue Dec 30 06:08:09 2003
++++ Makefile.in	Sun Jan  4 17:58:03 2004
+@@ -1,19 +1,19 @@
+-DEBUG=
+-FLAGS=-Wall -O3
++#DEBUG=
++#FLAGS=
+ 
+ all:
+ 	cd src && make
  	cd examples && make
  
  install:
 -	cp include/memgrep.h /usr/include
 -	cp libmemgrep.so /usr/lib
 -	cp libmemgrep.a /usr/lib
+-	cp heaplist.so /usr/lib
 -	cp memgrep /usr/bin
-+	${INSTALL} include/memgrep.h ${PREFIX}/include
-+	${INSTALL} libmemgrep.so ${PREFIX}/lib
-+	${INSTALL} libmemgrep.a ${PREFIX}/lib
-+	${INSTALL} memgrep ${PREFIX}/bin
++	${BSD_INSTALL_DATA} include/memgrep.h ${PREFIX}/include
++	${BSD_INSTALL_PROGRAM} libmemgrep.so ${PREFIX}/lib
++	${BSD_INSTALL_DATA} libmemgrep.a ${PREFIX}/lib
++	${BSD_INSTALL_PROGRAM} heaplist.so ${PREFIX}/lib
++	${BSD_INSTALL_PROGRAM} memgrep ${PREFIX}/bin
  
  uninstall:
 -	rm -f /usr/lib/libmemgrep.so /usr/lib/libmemgrep.a /usr/bin/memgrep /usr/include/memgrep.h
diff --git a/sysutils/memgrep/pkg-plist b/sysutils/memgrep/pkg-plist
index 8ab17104f0e2..0cb966f971b1 100644
--- a/sysutils/memgrep/pkg-plist
+++ b/sysutils/memgrep/pkg-plist
@@ -1,27 +1,5 @@
 bin/memgrep
 include/memgrep.h
+lib/heaplist.so
 lib/libmemgrep.so
 lib/libmemgrep.a
-%%PORTDOCS%%share/doc/memgrep/html/annotated.html
-%%PORTDOCS%%share/doc/memgrep/html/doxygen.css
-%%PORTDOCS%%share/doc/memgrep/html/doxygen.png
-%%PORTDOCS%%share/doc/memgrep/html/examples.html
-%%PORTDOCS%%share/doc/memgrep/html/files.html
-%%PORTDOCS%%share/doc/memgrep/html/functions.html
-%%PORTDOCS%%share/doc/memgrep/html/group__memgrep.html
-%%PORTDOCS%%share/doc/memgrep/html/index.html
-%%PORTDOCS%%share/doc/memgrep/html/memgrep_8h-source.html
-%%PORTDOCS%%share/doc/memgrep/html/modules.html
-%%PORTDOCS%%share/doc/memgrep/html/simple_8c-example.html
-%%PORTDOCS%%share/doc/memgrep/html/struct__core__memory__sections.html
-%%PORTDOCS%%share/doc/memgrep/html/struct__mem__ctx.html
-%%PORTDOCS%%share/doc/memgrep/html/struct__mem__ctx__core__data.html
-%%PORTDOCS%%share/doc/memgrep/html/struct__memgrep__functions.html
-%%PORTDOCS%%share/doc/memgrep/html/struct__memgrep__result.html
-%%PORTDOCS%%share/doc/memgrep/html/struct__memgrep__result__row.html
-%%PORTDOCS%%share/doc/memgrep/html/struct__memgrep__result__row__dump.html
-%%PORTDOCS%%share/doc/memgrep/html/struct__memgrep__result__row__replace.html
-%%PORTDOCS%%share/doc/memgrep/html/struct__memgrep__result__row__search.html
-%%PORTDOCS%%share/doc/memgrep/html/struct__process__section__addrs.html
-%%PORTDOCS%%@dirrm share/doc/memgrep/html
-%%PORTDOCS%%@dirrm share/doc/memgrep