diff --git a/print/gv/distinfo b/print/gv/distinfo
index 62336e688a76..a4e59d8ccf74 100644
--- a/print/gv/distinfo
+++ b/print/gv/distinfo
@@ -1 +1 @@
-MD5 (gv-3.4.12.tar.gz) = adb6aeca2bb1094297cbfbf4297df4e4
+MD5 (gv-3.5.3.tar.gz) = 6586c56976004b4ada7cc6cec524b36a
diff --git a/print/gv/files/patch-aa b/print/gv/files/patch-aa
index 5888aad37dcd..25d32adbd78d 100644
--- a/print/gv/files/patch-aa
+++ b/print/gv/files/patch-aa
@@ -1,15 +1,17 @@
---- config.Unix.orig	Tue Apr 15 00:00:00 1997
-+++ config.Unix	Thu Apr 17 16:13:48 1997
-@@ -32,9 +32,9 @@
+--- config.Unix.orig	Fri Jun  6 15:00:00 1997
++++ config.Unix	Mon Jun  9 14:45:19 1997
+@@ -32,10 +32,10 @@
  XCOMM --------------------------------------------------------------------
  XCOMM  Destination directories.
  XCOMM --------------------------------------------------------------------
--      GV_MANDIR    = /usr/local/man/man1/
 -      GV_BINDIR    = /usr/local/bin/
+-      GV_DOCDIR    = /usr/local/doc/gv/
 -      GV_LIBDIR    = /usr/local/lib/gv/
-+      GV_MANDIR    = $(MANDIR)
+-      GV_MANDIR    = /usr/local/man/man1/
 +      GV_BINDIR    = $(BINDIR)
++      GV_DOCDIR    = /usr/X11R6/share/doc/gv/
 +      GV_LIBDIR    = $(LIBDIR)/gv/
++      GV_MANDIR    = $(MANDIR)
  
  XCOMM --------------------------------------------------------------------
  XCOMM --- The name of the Xaw3d library.
diff --git a/print/gv/files/patch-ab b/print/gv/files/patch-ab
index 88120578c454..94ed6122e49e 100644
--- a/print/gv/files/patch-ab
+++ b/print/gv/files/patch-ab
@@ -1,6 +1,6 @@
---- doc/Imakefile.orig	Sun Apr  6 00:00:00 1997
-+++ doc/Imakefile	Thu Apr 17 16:24:07 1997
-@@ -27,6 +27,6 @@
+--- doc/Imakefile.orig	Fri Jun  6 15:00:00 1997
++++ doc/Imakefile	Mon Jun  9 14:36:59 1997
+@@ -27,7 +27,7 @@
  GV_CONFIG_FILE = ../config.Unix
  #include "../config.Unix"
  
@@ -8,3 +8,4 @@
 +XCOMM MANDIR=$(GV_MANDIR)
  
  ComplexProgramTarget(gv)
+ 
diff --git a/print/gv/pkg-plist b/print/gv/pkg-plist
index c77644fad925..64826bb8ac59 100644
--- a/print/gv/pkg-plist
+++ b/print/gv/pkg-plist
@@ -1,7 +1,28 @@
 bin/gv
 lib/X11/app-defaults/GV
 lib/X11/gv/gv_class.ad
-lib/X11/gv/gv_spartan.dat
 lib/X11/gv/gv_system.ad
 lib/X11/gv/gv_user.ad
 man/man1/gv.1.gz
+share/doc/gv/comments.doc.gz
+share/doc/gv/gs.interface.gz
+share/doc/gv/gv-1.html
+share/doc/gv/gv-10.html
+share/doc/gv/gv-11.html
+share/doc/gv/gv-12.html
+share/doc/gv/gv-13.html
+share/doc/gv/gv-2.html
+share/doc/gv/gv-3.html 
+share/doc/gv/gv-4.html
+share/doc/gv/gv-5.html
+share/doc/gv/gv-6.html
+share/doc/gv/gv-7.html
+share/doc/gv/gv-8.html
+share/doc/gv/gv-9.html
+share/doc/gv/gv-faq.html
+share/doc/gv/gv-faq.txt.gz
+share/doc/gv/gv.html
+share/doc/gv/gv.ps.gz
+share/doc/gv/key-bindings.txt.gz
+@dirrm lib/X11/gv
+@dirrm share/doc/gv