diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 1e8ceed6878f..54a50a2b71f1 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -1,11 +1,24 @@
 { stdenv, fetchurl, python, pkgconfig, cairo, x11 }:
 
-stdenv.mkDerivation {
-  name = "pycairo-1.8.8";
-  src = fetchurl {
-    url = http://cairographics.org/releases/pycairo-1.8.8.tar.gz;
-    sha256 = "0q18hd4ai4raljlvd76ylgi30kxpr2qq83ka6gzwh0ya8fcmjlig";
-  };
+stdenv.mkDerivation rec {
+  version = "1.10.0";
+  name = "pycairo-${version}";
+  src = if python.is_py3k or false
+    then fetchurl {
+      url = "http://cairographics.org/releases/pycairo-${version}.tar.bz2";
+      sha256 = "1gjkf8x6hyx1skq3hhwcbvwifxvrf9qxis5vx8x5igmmgs70g94s";
+    }
+    else fetchurl {
+      url = "http://cairographics.org/releases/py2cairo-${version}.tar.bz2";
+      sha256 = "0cblk919wh6w0pgb45zf48xwxykfif16qk264yga7h9fdkq3j16k";
+    };
 
   buildInputs = [ python pkgconfig cairo x11 ];
+  preConfigure = ''
+    sed -e 's@#!/usr/bin/env python@#!${python.executable}@' -i waf
+    head waf
+  '';
+  configurePhase = "${python.executable} waf configure --prefix=$out";
+  buildPhase = "${python.executable} waf";
+  installPhase = "${python.executable} waf install";
 }