diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix
index 5fb672b8ff1..06f2deb3a7c 100644
--- a/pkgs/development/libraries/cfitsio/default.nix
+++ b/pkgs/development/libraries/cfitsio/default.nix
@@ -1,13 +1,35 @@
-args: with args;
+{ fetchurl, stdenv }:
+
 stdenv.mkDerivation {
-	name = "cfitsio-3.060";
-	src = fetchurl {
-		url = ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3060.tar.gz;
-		sha256 = "0ijbjpl5v35m538sa3c82qgja697kddjbj7yxx64ka7pdsdnfx9l";
-	};
-# Shared-only build
-	buildFlags = "shared";
-	patchPhase = ''
-	sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
-	'';
+  name = "cfitsio-3.21";
+
+  src = fetchurl {
+    url = ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3210.tar.gz;
+    sha256 = "1ffr3p5dy2b1vj9j4li5zf22naavi9wcxsvqy236fc0ykfyip96i";
+  };
+
+  # Shared-only build
+  buildFlags = "shared";
+  patchPhase =
+   '' sed -e '/^install:/s/libcfitsio.a //' -e 's@/bin/@@g' -i Makefile.in
+   '';
+
+  meta = {
+    homepage = http://heasarc.gsfc.nasa.gov/fitsio/;
+
+    description = "CFITSIO, a library for reading and writing FITS data files";
+
+    longDescription =
+      '' CFITSIO is a library of C and Fortran subroutines for reading and
+         writing data files in FITS (Flexible Image Transport System) data
+         format.  CFITSIO provides simple high-level routines for reading and
+         writing FITS files that insulate the programmer from the internal
+         complexities of the FITS format.  CFITSIO also provides many
+         advanced features for manipulating and filtering the information in
+         FITS files.
+      '';
+
+    # Permissive BSD-style license.
+    license = "permissive";
+  };
 }