diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index 499639b3a87c..15b80053218d 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -1,17 +1,34 @@
-{ stdenv, fetchurl, freetype, fontconfig, pkgconfig, enca ? null }:
+{ stdenv, fetchurl, pkgconfig, yasm
+, freetype, fribidi, fontconfig
+, enca ? null
+, harfbuzz ? null
+}:
 
-stdenv.mkDerivation rec {
-  name = "libass-0.9.11";
+let
+  version = "0.11.1";
+  sha256 = "1b0ki1zdkhflszzj5qr45j9qsd0rfbb6ws5pqkny8jhih0l3lxwx";
+  baseurl = "https://github.com/libass/libass/releases/download";
+in stdenv.mkDerivation rec {
+  name = "libass-${version}";
 
   src = fetchurl {
-    url = "http://libass.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "0p3li523s8n85kfh5xdbbfffr17z8xdh2qcgvdg7ki1myv6agl7z";
+    url = "${baseurl}/${version}/${name}.tar.xz";
+    inherit sha256;
   };
 
-  buildInputs = [ freetype fontconfig enca pkgconfig ];
+  nativeBuildInputs = [ pkgconfig yasm ];
+
+  buildInputs = [
+    freetype fribidi fontconfig
+    enca harfbuzz
+  ];
 
   meta = {
+    description = "Portable ASS/SSA subtitle renderer";
     homepage = http://code.google.com/p/libass/;
+    license = stdenv.lib.licenses.isc;
+    platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.urkud ];
+    repositories.git = git://github.com/libass/libass.git;
   };
 }