diff --git a/astro/Makefile b/astro/Makefile
index a67b9b631fd5..97bceb22fde5 100644
--- a/astro/Makefile
+++ b/astro/Makefile
@@ -6,6 +6,7 @@
     SUBDIR += SETIsupport
     SUBDIR += accrete
     SUBDIR += celestia
+    SUBDIR += cfitsio
     SUBDIR += dgpsip
     SUBDIR += ephem
     SUBDIR += fooseti
diff --git a/astro/cfitsio/Makefile b/astro/cfitsio/Makefile
new file mode 100644
index 000000000000..bedd5119fdee
--- /dev/null
+++ b/astro/cfitsio/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for:	cfitsio
+# Date created:				Fri Apr 30 16:49:36 CEST 2004
+# Whom:					Markus Brueffer <markus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	cfitsio
+PORTVERSION=	2.490
+CATEGORIES=	astro
+MASTER_SITES=	ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Library for reading and writing files in FITS data format
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+
+ALL_TARGET=	shared
+
+post-install:
+	${MV} ${PREFIX}/lib/libcfitsio.so ${PREFIX}/lib/libcfitsio.so.0
+	${LN} -s ${PREFIX}/lib/libcfitsio.so.0 ${PREFIX}/lib/libcfitsio.so
+.ifndef(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${CP} -R ${WRKSRC}/*.doc ${DOCSDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/astro/cfitsio/distinfo b/astro/cfitsio/distinfo
new file mode 100644
index 000000000000..8d325130b9af
--- /dev/null
+++ b/astro/cfitsio/distinfo
@@ -0,0 +1,2 @@
+MD5 (cfitsio2490.tar.gz) = 271b07dcfe3e928e5138d64672eb77d9
+SIZE (cfitsio2490.tar.gz) = 2032914
diff --git a/astro/cfitsio/pkg-descr b/astro/cfitsio/pkg-descr
new file mode 100644
index 000000000000..a6a1a86448cd
--- /dev/null
+++ b/astro/cfitsio/pkg-descr
@@ -0,0 +1,10 @@
+CFITSIO is a library of C and Fortran subroutines for reading and writing
+data files in FITS (Flexible Image Transport System) data format. CFITSIO
+simplifies the task of writing software that deals with FITS files by
+providing an easy to use set of high-level routines that insulate the
+programmer from the internal complexities of the FITS file format. At
+the same time, CFITSIO provides many advanced features that have made
+it the most widely used FITS file programming interface in the
+astronomical community. 
+
+WWW: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/
diff --git a/astro/cfitsio/pkg-plist b/astro/cfitsio/pkg-plist
new file mode 100644
index 000000000000..8dccfddfdaa5
--- /dev/null
+++ b/astro/cfitsio/pkg-plist
@@ -0,0 +1,11 @@
+include/drvrsmem.h
+include/fitsio.h
+include/fitsio2.h
+include/longnam.h
+lib/libcfitsio.a
+lib/libcfitsio.so
+lib/libcfitsio.so.0
+%%PORTDOCS%%%%DOCSDIR%%/cfitsio.doc
+%%PORTDOCS%%%%DOCSDIR%%/cfortran.doc
+%%PORTDOCS%%%%DOCSDIR%%/fitsio.doc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%