diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix
index 8098b9d278f..8219882a2a2 100644
--- a/pkgs/development/compilers/nasm/default.nix
+++ b/pkgs/development/compilers/nasm/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "nasm-2.11.01";
+  name = "nasm-${version}";
+  version = "2.11.05";
   
   src = fetchurl {
-    url = "http://www.nasm.us/pub/nasm/releasebuilds/2.11.01/${name}.tar.bz2";
-    sha256 = "0p0rhq18in2hyv3gircgxj72n2b1mvr8bvjlqscpaz8m62cyvam7";
+    url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2";
+    sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/gnu-efi/default.nix b/pkgs/development/libraries/gnu-efi/default.nix
index 07c3c668793..f038883bd67 100644
--- a/pkgs/development/libraries/gnu-efi/default.nix
+++ b/pkgs/development/libraries/gnu-efi/default.nix
@@ -1,23 +1,15 @@
-{ stdenv
-, fetchurl
-}:
+{ stdenv, fetchurl }:
 
-let version = "3.0u"; in stdenv.mkDerivation {
-
-  name = "gnu-efi-${version}";
+stdenv.mkDerivation rec {
+  name = "gnu-efi_${version}";
+  version = "3.0v";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnu-efi/gnu-efi_${version}.orig.tar.gz";
-    sha256 = "0klkdxh1aqwwfm393q67nxww6liffyp2lfybbnh4q819b06la39w";
+    url = "mirror://sourceforge/gnu-efi/${name}.orig.tar.gz";
+    sha256 = "1pqgpm999l7zb8gh3s0zd2ax6f0n2l4jip7h0d2y91hhcy6zjxn7";
   };
 
-  meta = {
-    description = "GNU EFI development toolchain";
-    homepage = http://sourceforge.net/projects/gnu-efi/;
-    license = "GPL";
-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-    platforms = ["x86_64-linux" "i686-linux"];
-  };
+  arch = with stdenv.lib; head (splitString "-" stdenv.system);
 
   makeFlags = [
     "CC=gcc"
@@ -34,8 +26,17 @@ let version = "3.0u"; in stdenv.mkDerivation {
   '';
 
   installPhase = ''
+    mkdir -pv $out/include/efi/{protocol,$arch}
     make PREFIX="$out" $makeFlags install
     mkdir -pv $out/share/gnu-efi
     install -D -m644 apps/*.efi $out/share/gnu-efi
   '';
+
+  meta = with stdenv.lib; {
+    description = "GNU EFI development toolchain";
+    homepage = http://sourceforge.net/projects/gnu-efi/;
+    license = licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.shlevy ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index 95f482a8230..734613c44ac 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, nasm, perl, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "syslinux-4.07";
+  name = "syslinux-6.02";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/boot/syslinux/4.xx/${name}.tar.bz2";
-    sha256 = "0nm0lx45h4c5nxnsr538bvryzvqvj1p1p4vqxzd8nlcv47ja8h0j";
+    url = "mirror://kernel/linux/utils/boot/syslinux/${name}.tar.xz";
+    sha256 = "0y2ld2s64s6vc5pf8rj36w71rq2cfax3c1iafp0w1qbjpxy1p8xg";
   };
 
   patches = [ ./perl-deps.patch ];
@@ -14,15 +14,27 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preBuild =
-    ''
-      substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)
-      substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)
-      makeFlagsArray=(BINDIR=$out/bin SBINDIR=$out/sbin LIBDIR=$out/lib INCDIR=$out/include DATADIR=$out/share MANDIR=$out/share/man PERL=perl)
-    '';
+  preBuild = ''
+    substituteInPlace Makefile --replace /bin/pwd $(type -P pwd)
+    substituteInPlace gpxe/src/Makefile.housekeeping --replace /bin/echo $(type -P echo)
+    substituteInPlace gpxe/src/Makefile --replace /usr/bin/perl $(type -P perl)
+  '';
 
-  meta = {
+  makeFlags = [
+    "BINDIR=$(out)/bin"
+    "SBINDIR=$(out)/sbin"
+    "LIBDIR=$(out)/lib"
+    "INCDIR=$(out)/include"
+    "DATADIR=$(out)/share"
+    "MANDIR=$(out)/share/man"
+    "PERL=perl"
+    "bios"
+  ];
+
+  meta = with stdenv.lib; {
     homepage = http://www.syslinux.org/;
     description = "A lightweight bootloader";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }