diff --git a/converters/wv2/Makefile b/converters/wv2/Makefile
index bdb82fb56e6..a35352fe881 100644
--- a/converters/wv2/Makefile
+++ b/converters/wv2/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2008/02/02 09:30:54 steven Exp $
+# $OpenBSD: Makefile,v 1.20 2008/07/25 15:16:33 sthen Exp $
 
 COMMENT=	library functions to access Microsoft Word/Excel files
 
 DISTNAME=	wv2-0.2.3
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 SHARED_LIBS +=	wv2                  2.1      # .1.8
 CATEGORIES=	converters
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=wvware/}
diff --git a/converters/wv2/patches/patch-configure b/converters/wv2/patches/patch-configure
new file mode 100644
index 00000000000..9ac791b1505
--- /dev/null
+++ b/converters/wv2/patches/patch-configure
@@ -0,0 +1,28 @@
+$OpenBSD: patch-configure,v 1.1 2008/07/25 15:16:34 sthen Exp $
+--- configure.orig	Fri Jul 25 15:59:24 2008
++++ configure	Fri Jul 25 16:01:23 2008
+@@ -25945,6 +25945,7 @@ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
++#include <math.h>
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -25952,13 +25953,12 @@ extern "C"
+ #endif
+ /* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+-char isnan ();
++double val = 0.0;
++
+ int
+ main ()
+ {
+-isnan ();
+-  ;
+-  return 0;
++  return isnan (val);
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext