diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index c90d031e989..2ee0c478212 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -69,7 +69,7 @@ let
       homepage    = "http://lcamtuf.coredump.cx/afl/";
       license     = stdenv.lib.licenses.asl20;
       platforms   = ["x86_64-linux" "i686-linux"];
-      maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
+      maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ];
     };
   };
 in afl
diff --git a/pkgs/tools/security/afl/qemu.nix b/pkgs/tools/security/afl/qemu.nix
index a007eb3913d..9e0f19361fb 100644
--- a/pkgs/tools/security/afl/qemu.nix
+++ b/pkgs/tools/security/afl/qemu.nix
@@ -1,7 +1,5 @@
-{ stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, ncurses, perl
-, attr, libcap, vde2, texinfo, libuuid, flex, bison, lzo, snappy
-, libaio, libcap_ng, gnutls, pixman, autoconf
-, writeText
+{ stdenv, fetchurl, afl, python2, zlib, pkgconfig, glib, perl
+, texinfo, libuuid, flex, bison, pixman, autoconf
 }:
 
 with stdenv.lib;
@@ -41,9 +39,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    zlib glib pixman ncurses attr libcap
-    vde2 libuuid lzo snappy libcap_ng gnutls
-  ] ++ optionals (stdenv.isLinux) [ libaio ];
+    zlib glib pixman libuuid
+  ];
 
   enableParallelBuilding = true;
 
@@ -63,9 +60,9 @@ stdenv.mkDerivation rec {
       "--disable-gtk"
       "--disable-sdl"
       "--disable-vnc"
+      "--disable-kvm"
       "--target-list=${cpuTarget}"
       "--enable-pie"
-      "--enable-kvm"
       "--sysconfdir=/etc"
       "--localstatedir=/var"
     ];