diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index d2b78f2a12ef..973a6b7090a8 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:	gawk
-# Version required:	3.0.3
+# Version required:	3.0.4
 # Date created:		Mi  21 Okt 1998 13:53:18 CEST
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
 # $FreeBSD$
 
-DISTNAME=	gawk-3.0.3
+DISTNAME=	gawk-3.0.4
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gawk
@@ -13,10 +13,10 @@ MASTER_SITE_SUBDIR=	gawk
 MAINTAINER=	andreas@FreeBSD.org
 
 MANUAL_PACKAGE_BUILD=	confuses zsh
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=g --enable-bitops --enable-non-decimal-data
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gawk ${PREFIX}/bin
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS=		--program-prefix=g \
+			--enable-bitops \
+			--enable-non-decimal-data
+MAN1= gawk.1
 
 .include <bsd.port.mk>
diff --git a/lang/gawk/distinfo b/lang/gawk/distinfo
index 67a18e586a91..d2e4d1906da7 100644
--- a/lang/gawk/distinfo
+++ b/lang/gawk/distinfo
@@ -1 +1 @@
-MD5 (gawk-3.0.3.tar.gz) = 531c1ba966fe072230e75bbad6f4dad8
+MD5 (gawk-3.0.4.tar.gz) = 58f904f256b3026c3fe27cf80e6291af
diff --git a/lang/gawk/pkg-comment b/lang/gawk/pkg-comment
index 627210a778d3..7e87b8c47dfc 100644
--- a/lang/gawk/pkg-comment
+++ b/lang/gawk/pkg-comment
@@ -1 +1 @@
-The GNU awk
+the gnu version of awk
diff --git a/lang/gawk/pkg-descr b/lang/gawk/pkg-descr
index ff7e23a5ed22..3b0e0d1aaeb9 100644
--- a/lang/gawk/pkg-descr
+++ b/lang/gawk/pkg-descr
@@ -1 +1,22 @@
-gawk is the GNU Project's awk
+This is GNU Awk 3.0.4. It should be upwardly compatible with the Bell
+Labs research version of awk.  It is almost completely compliant with
+the 1993 POSIX 1003.2 standard for awk. (See the note below about POSIX.)
+
+Patches 1 through 4 just fix bugs -- see NEWS and ChangeLog for details.
+
+See the file INSTALL for installation instructions.
+
+Known problems are given in the PROBLEMS file.  Work to be done is
+described briefly in the FUTURES file.  Verified ports are listed in
+the PORTS file.  Changes in this version are summarized in the NEWS file.
+Please read the LIMITATIONS and ACKNOWLEDGMENT files.
+
+Read the file POSIX for a discussion of how the standard says comparisons
+should be done vs. how they really should be done and how gawk does them.
+  
+To format the documentation with TeX, use at least version 2.151 of
+texinfo.tex. There is a usable copy of texinfo.tex in the doc directory.
+
+The Info file now comes with the distribution.
+
+The man page is up to date.
diff --git a/lang/gawk/pkg-plist b/lang/gawk/pkg-plist
index 63d30849c64e..dd09ce1af283 100644
--- a/lang/gawk/pkg-plist
+++ b/lang/gawk/pkg-plist
@@ -1 +1,5 @@
 bin/gawk
+bin/gawk-3.0.4
+info/gawk.info
+@dirrm libexec/awk
+@dirrm share/awk