diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 7f9701fe3dc..95cfef614a4 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -8,12 +8,12 @@
 assert postscriptSupport -> zlib != null;
 assert pngSupport -> libpng != null;
 
-stdenv.mkDerivation {
-  name = "cairo-1.6.4";
+stdenv.mkDerivation rec {
+  name = "cairo-1.8.6";
   
   src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.6.4.tar.gz;
-    sha1 = "9d990fe39a125ceb07221623c237cd7015855d5c";
+    url = "http://cairographics.org/releases/${name}.tar.gz";
+    sha256 = "0d9mfwq7r66j85hqjcjavwbn7c8gdaqnahmmiyz5iwpc1jplg8wk";
   };
 
   buildInputs = [
@@ -29,6 +29,21 @@ stdenv.mkDerivation {
 
   meta = {
     description = "A 2D graphics library with support for multiple output devices";
+
+    longDescription = ''
+      Cairo is a 2D graphics library with support for multiple output
+      devices.  Currently supported output targets include the X
+      Window System, Quartz, Win32, image buffers, PostScript, PDF,
+      and SVG file output.  Experimental backends include OpenGL
+      (through glitz), XCB, BeOS, OS/2, and DirectFB.
+
+      Cairo is designed to produce consistent output on all output
+      media while taking advantage of display hardware acceleration
+      when available (e.g., through the X Render Extension).
+    '';
+
     homepage = http://cairographics.org/;
+
+    licenses = [ "LGPLv2+" "MPLv1" ];
   };
 }