diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index e614a863d84c..f59f95089aad 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	boehm-gc
-PORTVERSION=	6.2.a3
+PORTVERSION=	6.2.a4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
 DISTNAME=	gc${PORTVERSION:S/.a/alpha/}
@@ -26,9 +26,6 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/gc.man
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/include/gc.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/include/gc_backptr.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/include/gc_cpp.h ${PREFIX}/include
 	${INSTALL_MAN} ${WRKSRC}/doc/gc.man ${PREFIX}/man/man3/gc.3
 
 .include <bsd.port.mk>
diff --git a/devel/boehm-gc/distinfo b/devel/boehm-gc/distinfo
index 2e9ca166ebb2..d25d13b9e218 100644
--- a/devel/boehm-gc/distinfo
+++ b/devel/boehm-gc/distinfo
@@ -1 +1 @@
-MD5 (gc6.2alpha3.tar.gz) = e6d1c8a1c6cca75e1cfb3ce0418d652c
+MD5 (gc6.2alpha4.tar.gz) = 69c39cb80b3d685c43651dceb8ea343f
diff --git a/devel/boehm-gc/files/patch-doc:Makefile.in b/devel/boehm-gc/files/patch-doc:Makefile.in
new file mode 100644
index 000000000000..6e562d488833
--- /dev/null
+++ b/devel/boehm-gc/files/patch-doc:Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Sun Apr 20 01:19:11 2003
++++ doc/Makefile.in	Sun Apr 20 01:19:15 2003
+@@ -46,7 +46,7 @@
+ mandir = @mandir@
+ includedir = @includedir@
+ oldincludedir = /usr/include
+-pkgdatadir = $(datadir)/@PACKAGE@
++pkgdatadir = $(datadir)/doc/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ top_builddir = ..
diff --git a/devel/boehm-gc/pkg-plist b/devel/boehm-gc/pkg-plist
index 65852348faf6..4e492527ede4 100644
--- a/devel/boehm-gc/pkg-plist
+++ b/devel/boehm-gc/pkg-plist
@@ -1,9 +1,57 @@
+include/gc/gc.h
+include/gc/gc_alloc.h
+include/gc/gc_allocator.h
+include/gc/gc_amiga_redirects.h
+include/gc/gc_backptr.h
+include/gc/gc_config_macros.h
+include/gc/gc_cpp.h
+include/gc/gc_gcj.h
+include/gc/gc_inl.h
+include/gc/gc_inline.h
+include/gc/gc_local_alloc.h
+include/gc/gc_mark.h
+include/gc/gc_pthread_redirects.h
+include/gc/gc_typed.h
+include/gc/leak_detector.h
+include/gc/new_gc_alloc.h
+include/gc/weakpointer.h
 include/gc.h
-include/gc_backptr.h
-include/gc_cpp.h
+include/gc_config_macros.h
 include/gc_local_alloc.h
-include/leak_detector.h
+include/gc_pthread_redirects.h
 include/gc_typed.h
+include/leak_detector.h
 lib/libgc.a
 lib/libgc.so
 lib/libgc.so.1
+share/doc/gc/README
+share/doc/gc/README.DGUX386
+share/doc/gc/README.Mac
+share/doc/gc/README.MacOSX
+share/doc/gc/README.OS2
+share/doc/gc/README.amiga
+share/doc/gc/README.arm.cross
+share/doc/gc/README.autoconf
+share/doc/gc/README.changes
+share/doc/gc/README.contributors
+share/doc/gc/README.cords
+share/doc/gc/README.dj
+share/doc/gc/README.environment
+share/doc/gc/README.ews4800
+share/doc/gc/README.hp
+share/doc/gc/README.linux
+share/doc/gc/README.macros
+share/doc/gc/README.rs6000
+share/doc/gc/README.sgi
+share/doc/gc/README.solaris2
+share/doc/gc/README.uts
+share/doc/gc/README.win32
+share/doc/gc/barrett_diagram
+share/doc/gc/debugging.html
+share/doc/gc/gc.man
+share/doc/gc/gcdescr.html
+share/doc/gc/gcinterface.html
+share/doc/gc/leak.html
+share/doc/gc/scale.html
+share/doc/gc/tree.html
+@dirrm include/gc