diff --git a/x11/viewfax/Makefile b/x11/viewfax/Makefile
index 0b7307cf7e2..cde4e120349 100644
--- a/x11/viewfax/Makefile
+++ b/x11/viewfax/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.15 2002/10/29 19:48:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2004/05/17 16:32:33 naddy Exp $
 # $FreeBSD: Makefile,v 1.9 1998/03/07 23:26:23 jmz Exp $
 
 COMMENT=	"display files containing g3 and/or g4 coded fax pages"
 
-DISTNAME=	viewfax-2.3
+DISTNAME=	viewfax-2.5
 CATEGORIES=	x11
 
 MASTER_SITES=	ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/
 
 CONFIGURE_STYLE=	imake
 
-# License: GPL
+# GPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
diff --git a/x11/viewfax/distinfo b/x11/viewfax/distinfo
index 1b1f0e7d87c..843315c21aa 100644
--- a/x11/viewfax/distinfo
+++ b/x11/viewfax/distinfo
@@ -1,3 +1,3 @@
-MD5 (viewfax-2.3.tar.gz) = cd98fa7aedf1a8d570e88f5813e49446
-RMD160 (viewfax-2.3.tar.gz) = 44e2b772719685750283e3d6bb1da3bdf2c5438d
-SHA1 (viewfax-2.3.tar.gz) = d474dd52106a560d69973398e60305ad2961a54c
+MD5 (viewfax-2.5.tar.gz) = 02cabb04ac917de28542b140752fad50
+RMD160 (viewfax-2.5.tar.gz) = 202c865cec3a9fbd0f47dd9adeef6d1c5f94f8d1
+SHA1 (viewfax-2.5.tar.gz) = f6669842223453cbd8d411b4679207b6a11cb4ad
diff --git a/x11/viewfax/patches/patch-aa b/x11/viewfax/patches/patch-aa
index abc739b3552..d0da4e50afb 100644
--- a/x11/viewfax/patches/patch-aa
+++ b/x11/viewfax/patches/patch-aa
@@ -1,18 +1,18 @@
---- Imakefile.orig	Sat Oct 14 15:52:03 1995
-+++ Imakefile	Sat Jun 10 02:55:15 2000
-@@ -1,14 +1,6 @@
+$OpenBSD: patch-aa,v 1.3 2004/05/17 16:32:33 naddy Exp $
+--- Imakefile.orig	Wed May 12 10:57:28 2004
++++ Imakefile	Wed May 12 11:00:07 2004
+@@ -1,13 +1,6 @@
  # Imakefile for viewfax
  
--#ifdef __FreeBSD__
--/* infect all their makefiles with ".include <bsd.foo.mk>" and then
--   complain about this.  Sheesh! :-) */
--HELPDIR = ${USRLIBDIR}/X11
--#else
+-#if 0
+-define these if the defaults are unsuitable
 -BINDIR = /usr/local/bin		/* where you want the binary installed */
 -MANDIR = /usr/local/man/man1	/* where you want the man file installed */
 -HELPDIR = /usr/local/lib	/* where you want the help file installed */
 -#endif
-+HELPDIR=${USRLIBDIR}/X11/viewfax
- 
+-
+-HELPDIR = ${USRLIBDIR}/X11
++HELPDIR = ${USRLIBDIR}/X11/viewfax
  DEFINES = -DHELPFILE=\"$(HELPDIR)/viewfax.tif\"
  
+ SRCS = viewfax.c faxinput.c faxinit.c faxexpand.c