diff --git a/math/cfitsio/Makefile b/math/cfitsio/Makefile
new file mode 100644
index 00000000000..68de3a3664f
--- /dev/null
+++ b/math/cfitsio/Makefile
@@ -0,0 +1,51 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2006/06/12 11:14:08 espie Exp $
+
+COMMENT=	"library for handling FITS data"
+CATEGORIES=	math graphics devel
+
+HOMEPAGE= 	http://heasarc.gsfc.nasa.gov/fitsio/fitsio.html
+
+DISTNAME=	cfitsio3006
+WRKDIST=	${WRKDIR}/cfitsio
+
+PKGNAME=	cfitsio-3.006
+MASTER_SITES=	ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/
+
+CONFIGURE_STYLE=autoconf no-autoheader
+AUTOCONF_VERSION=2.13
+
+# Mostly BSD-style, with two chunks of GPL code
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+
+ALL_TARGET=	all fitscopy imcopy listhead
+SHARED_LIBS=	cfitsio	0.0
+SHLIB_SUFFIX=	.so.${LIBcfitsio_VERSION}
+MAKE_FLAGS=	SHLIB_SUFFIX=${SHLIB_SUFFIX}
+WANTLIB=	c m
+
+DOCDIR=${PREFIX}/share/doc/cfitsio
+
+do-install:
+	${INSTALL_DATA} ${WRKDIST}/{fitsio.h,fitsio2.h,longnam.h,drvrsmem.h} ${PREFIX}/include
+	${INSTALL_DATA}	${WRKBUILD}/libcfitsio.a ${PREFIX}/lib
+	-${INSTALL_DATA} ${WRKBUILD}/libcfitsio${SHLIB_SUFFIX} ${PREFIX}/lib
+	${INSTALL_DATA_DIR} ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/License.txt ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/README ${DOCDIR}
+	${INSTALL_DATA} ${WRKDIST}/*.doc ${DOCDIR}
+	${INSTALL_PROGRAM} ${WRKBUILD}/{fitscopy,imcopy,listhead} ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKBUILD}/cookbook.c ${DOCDIR}
+
+do-regress:
+	cd ${WRKBUILD} && ${MAKE} testprog
+	cd ${WRKBUILD} && ./testprog >testprog.lis
+	diff ${WRKBUILD}/testprog.lis ${WRKBUILD}/testprog.out
+	cmp ${WRKBUILD}/testprog.fit ${WRKBUILD}/testprog.std
+	
+.include <bsd.port.mk>
+.if ${NO_SHARED_LIBS:L} == "no"
+ALL_TARGET+=shared
+.endif
diff --git a/math/cfitsio/distinfo b/math/cfitsio/distinfo
new file mode 100644
index 00000000000..ca654b0a2d6
--- /dev/null
+++ b/math/cfitsio/distinfo
@@ -0,0 +1,4 @@
+MD5 (cfitsio3006.tar.gz) = 4aacb54dcf833c8075d1f6515ba069ca
+RMD160 (cfitsio3006.tar.gz) = 76244e8fa523992f345ae1a7ab4f41ed6c6adb91
+SHA1 (cfitsio3006.tar.gz) = ce850ea422c1ae86b19bcce4504dc216a29d1b07
+SIZE (cfitsio3006.tar.gz) = 2121107
diff --git a/math/cfitsio/patches/patch-configure_in b/math/cfitsio/patches/patch-configure_in
new file mode 100644
index 00000000000..0e7d2a497ac
--- /dev/null
+++ b/math/cfitsio/patches/patch-configure_in
@@ -0,0 +1,23 @@
+$OpenBSD: patch-configure_in,v 1.1.1.1 2006/06/12 11:14:08 espie Exp $
+--- configure.in.orig	Thu Jul 28 23:26:00 2005
++++ configure.in	Mon Jun 12 13:04:54 2006
+@@ -307,7 +307,8 @@ AC_MSG_RESULT("yes")
+ # -------------------------------------------------------------------------
+ 
+ AC_MSG_CHECKING("whether system V style IPC services are supported")
+-AC_TRY_LINK([#include <sys/ipc.h>
++AC_TRY_LINK([#include <sys/types.h>
++#include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <sys/sem.h>
+ ], [
+@@ -354,7 +355,8 @@ fi
+ 
+ AC_MSG_CHECKING("do we have union semun defined")
+ AC_TRY_COMPILE(
+-[#include <sys/ipc.h>
++[#include <sys/types.h>
++#include <sys/ipc.h>
+ #include <sys/shm.h>
+ #include <sys/sem.h>
+ ], [
diff --git a/math/cfitsio/pkg/DESCR b/math/cfitsio/pkg/DESCR
new file mode 100644
index 00000000000..62963365e33
--- /dev/null
+++ b/math/cfitsio/pkg/DESCR
@@ -0,0 +1,4 @@
+The CFITS format is a standard format used in astrophysics.
+This library yields C source to manipulate all aspects of this format.
+
+Extended documentation is available on the web site.
diff --git a/math/cfitsio/pkg/PFRAG.shared b/math/cfitsio/pkg/PFRAG.shared
new file mode 100644
index 00000000000..24c45b3fda9
--- /dev/null
+++ b/math/cfitsio/pkg/PFRAG.shared
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2006/06/12 11:14:08 espie Exp $
+@lib lib/libcfitsio.so.${LIBcfitsio_VERSION}
diff --git a/math/cfitsio/pkg/PLIST b/math/cfitsio/pkg/PLIST
new file mode 100644
index 00000000000..1eec66d2a79
--- /dev/null
+++ b/math/cfitsio/pkg/PLIST
@@ -0,0 +1,17 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2006/06/12 11:14:08 espie Exp $
+%%SHARED%%
+bin/fitscopy
+bin/imcopy
+bin/listhead
+include/drvrsmem.h
+include/fitsio.h
+include/fitsio2.h
+include/longnam.h
+lib/libcfitsio.a
+share/doc/cfitsio/
+share/doc/cfitsio/License.txt
+share/doc/cfitsio/README
+share/doc/cfitsio/cfitsio.doc
+share/doc/cfitsio/cfortran.doc
+share/doc/cfitsio/cookbook.c
+share/doc/cfitsio/fitsio.doc