diff --git a/pkgs/servers/sabnzbd/builder.sh b/pkgs/servers/sabnzbd/builder.sh
index 3a5c8adb421e..c446891d8dc3 100644
--- a/pkgs/servers/sabnzbd/builder.sh
+++ b/pkgs/servers/sabnzbd/builder.sh
@@ -3,14 +3,11 @@ source $stdenv/setup
 tar xvfz $src
 mv SABnzbd-* $out
 
-# Create a start script and let wrapProgram with toPythonPath wrap it so that python is started with cheetahTemplate in its importpath (classpath)
 mkdir $out/bin
 echo "$python/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd
 chmod +x $out/bin/sabnzbd
 
-for i in $(cd $out/bin && ls); do
-  wrapProgram $out/bin/$i --prefix PYTHONPATH : "$(toPythonPath $python):$(toPythonPath $out):$(toPythonPath $cheetahTemplate):$(toPythonPath $sqlite3)" \
-                          --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin"
-done
+wrapPythonProgramsIn $out/bin "$pythonPath"
+wrapProgram $out/bin/.sabnzbd-wrapped --prefix PATH : "$par2cmdline/bin:$unzip/bin:$unrar/bin"
 
 echo $out
diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix
index 09c0de9c74f1..ee2176ae49a1 100644
--- a/pkgs/servers/sabnzbd/default.nix
+++ b/pkgs/servers/sabnzbd/default.nix
@@ -1,20 +1,24 @@
-{stdenv, fetchurl, python, pythonPackages, cheetahTemplate, makeWrapper, par2cmdline, unzip, unrar}:
+{stdenv, fetchurl, python, pythonPackages, par2cmdline, unzip, unrar}:
 
 stdenv.mkDerivation rec {
-  name = "sabnzbd-0.7.17";
-  
+  version = "0.7.20";
+  name = "sabnzbd-${version}";
+
   src = fetchurl {
-    url = mirror://sourceforge/sabnzbdplus/SABnzbd-0.7.17-src.tar.gz;
-    sha256 = "02gbh3q3qnbwy4xn1hw4i4fyw4j5nkrqy4ak46mxwqgip9ym20d5";
+    url = "mirror://sourceforge/sabnzbdplus/SABnzbd-${version}-src.tar.gz";
+    sha256 = "0hl7mwgyvm4d68346s7vlv0qlibfh2p2idpyzpjfvk8f79hs9cr0";
   };
 
-  buildInputs = [makeWrapper python sqlite3 cheetahTemplate];
-  inherit stdenv python cheetahTemplate par2cmdline unzip unrar; 
-  inherit (pythonPackages) sqlite3;
+  pythonPath = with pythonPackages; [ pyopenssl sqlite3 cheetah ];
+  buildInputs = with pythonPackages; [wrapPython];
+  inherit python par2cmdline unzip unrar;
 
   builder = ./builder.sh;
-  
-  meta = {
+
+  meta = with stdenv.lib; {
     description = "Usenet NZB downloader, par2 repairer and auto extracting server";
+    homepage = http://sabnzbd.org;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
 }