diff --git a/math/cfitsio/Makefile b/math/cfitsio/Makefile
index 513d5154df2..f64d0bacb62 100644
--- a/math/cfitsio/Makefile
+++ b/math/cfitsio/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2007/09/15 18:44:36 steven Exp $
+# $OpenBSD: Makefile,v 1.4 2008/01/23 15:57:26 naddy Exp $
 
 COMMENT=	library for handling FITS data
 CATEGORIES=	math graphics devel
@@ -8,7 +8,7 @@ HOMEPAGE= 	http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html
 DISTNAME=	cfitsio3006
 WRKDIST=	${WRKDIR}/cfitsio
 
-PKGNAME=	cfitsio-3.006
+PKGNAME=	cfitsio-3.006p0
 MASTER_SITES=	ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/
 
 CONFIGURE_STYLE=autoconf no-autoheader
diff --git a/math/cfitsio/patches/patch-fitsio2_h b/math/cfitsio/patches/patch-fitsio2_h
index 20b87dc9dd0..ec6f4476a03 100644
--- a/math/cfitsio/patches/patch-fitsio2_h
+++ b/math/cfitsio/patches/patch-fitsio2_h
@@ -1,11 +1,12 @@
-$OpenBSD: patch-fitsio2_h,v 1.1 2006/06/29 00:43:58 pvalchev Exp $
---- fitsio2.h.orig	Wed Jun 28 17:58:38 2006
-+++ fitsio2.h	Wed Jun 28 17:58:40 2006
-@@ -62,6 +62,7 @@
- #elif defined(__ia64__)  || defined(__x86_64__)
-                   /*  Intel itanium 64-bit PC, or AMD opteron 64-bit PC */
- #define BYTESWAPPED TRUE
-+#define MACHINE NATIVE
- #define LONGSIZE 64   
+$OpenBSD: patch-fitsio2_h,v 1.2 2008/01/23 15:57:26 naddy Exp $
+--- fitsio2.h.orig	Tue Jan  3 23:05:19 2006
++++ fitsio2.h	Tue Jan 22 22:05:04 2008
+@@ -28,6 +28,8 @@
+ #define MINDIRECT 8640   /* minimum size for direct reads and writes */
+                          /* MINDIRECT must have a value >= 8640 */
  
- #elif defined(_SX)             /* Nec SuperUx */
++#undef  MACHINE          /* OpenBSD <machine/param.h> */
++
+ /*   it is useful to identify certain specific types of machines   */
+ #define NATIVE             0 /* machine that uses non-byteswapped IEEE formats */
+ #define OTHERTYPE          1  /* any other type of machine */