diff --git a/print/gv/Makefile b/print/gv/Makefile
index 88290bdf750..081ee5e1bb1 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2003/06/04 01:32:06 margarida Exp $
+# $OpenBSD: Makefile,v 1.23 2004/01/04 21:32:18 espie Exp $
 
 COMMENT= 	"PostScript and PDF previewer"
 
@@ -25,7 +25,11 @@ NO_REGRESS=	Yes
 
 INSTALL_TARGET=	install install.man install.doc
 
+post-patch:
+	perl -pi.bak ${.CURDIR}/fixincludes ${WRKSRC}/source/*.[ch]
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/source/gv.0 ${PREFIX}/man/cat1
 
+
 .include <bsd.port.mk>
diff --git a/print/gv/fixincludes b/print/gv/fixincludes
new file mode 100644
index 00000000000..d70bf5a0121
--- /dev/null
+++ b/print/gv/fixincludes
@@ -0,0 +1,18 @@
+# $OpenBSD: fixincludes,v 1.1 2004/01/04 21:32:18 espie Exp $
+# Copyright (c) 2004 Marc Espie <espie@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+s/\#\s*include\s+INC_X11\((.*?)\)/\#include \<X11\/$1\>/;
+s/\#\s*include\s+INC_XMU\((.*?)\)/\#include \<X11\/Xmu\/$1\>/;
+s/\#\s*include\s+INC_XAW\((.*?)\)/\#include \<X11\/Xaw3d\/$1\>/;