diff --git a/system/boot/syslinux/actions.py b/system/boot/syslinux/actions.py
index e96d624204..7a14c04681 100644
--- a/system/boot/syslinux/actions.py
+++ b/system/boot/syslinux/actions.py
@@ -9,29 +9,38 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 
-tools = ["sha1pass", "md5pass", "mkdiskimage", "keytab-lilo", "syslinux2ansi", "lss16toppm","pxelinux-options"]
+tools = ["sha1pass", "md5pass", "mkdiskimage*", "keytab-lilo", "syslinux2ansi", "lss16toppm","pxelinux-options"]
 datadir = "/usr/lib/syslinux"
 
 NoStrip = ["/sbin", "/usr/lib"]
 
-pisitools.flags.remove("-fPIC")
-
 def build():
-    # shelltools.export("CFLAGS", "-Werror -Wno-unused -finline-limit=2000")
     shelltools.export("CFLAGS", get.CFLAGS())
     shelltools.export("LDFLAGS", "")
+    # do not swallow efi compilation output to make debugging easier
+    shelltools.system("sed 's|> /dev/null 2>&1||' -i efi/check-gnu-efi.sh")
+      
+    # disable debug and development flags to reduce bootloader size
+    shelltools.system("truncate --size 0 mk/devel.mk")
 
-    autotools.make('DATE="PisiLinux" spotless')
-    autotools.make('DATE="PisiLinux"')
-    # autotools.make('DATE="PARDUS" installer')
-    # autotools.make('DATE="PARDUS" -C sample tidy')
+    autotools.make("-j1 PYTHON=python bios efi64 efi32")
 
 def install():
     autotools.rawInstall('INSTALLROOT=%s MANDIR="/usr/share/man" AUXDIR="/usr/lib/syslinux"' % get.installDIR())
-    for f in tools:
-        pisitools.insinto(datadir, "utils/"+f)
 
-    #pisitools.domove("/usr/lib/syslinux/libutil_com.c32","/usr/lib/syslinux/com32/libutil")
-    #pisitools.domove("/usr/lib/syslinux/libcom32.c32","/usr/lib/syslinux/com32/lib")
+    #pisitools.removeDir("/usr/lib/syslinux/com32")
+    #pisitools.removeDir("/usr/lib/syslinux/dosutil")
+    #pisitools.remove("/usr/lib/syslinux/syslinux.com")
+    
+    # pisitools.dodir("/usr/lib/syslinux/bios")
+    
+    # pisitools.domove("/usr/lib/syslinux/*.c32", "/usr/lib/syslinux/bios")
+    # pisitools.domove("/usr/lib/syslinux/*.bin", "/usr/lib/syslinux/bios")
+    # pisitools.domove("/usr/lib/syslinux/*.0", "/usr/lib/syslinux/bios")
+    # pisitools.domove("/usr/lib/syslinux/memdisk", "/usr/lib/syslinux/bios")
+    
+    for f in tools:
+        pisitools.insinto(datadir, "utils/"+f) 
+
     pisitools.dodoc("README", "NEWS", "doc/*.txt", "doc/logo/LICENSE")
     pisitools.remove("/usr/bin/gethostip")
diff --git a/system/boot/syslinux/pspec.xml b/system/boot/syslinux/pspec.xml
index c959891c68..e50693ea57 100644
--- a/system/boot/syslinux/pspec.xml
+++ b/system/boot/syslinux/pspec.xml
@@ -13,14 +13,21 @@
         <IsA>app:console</IsA>
         <Summary>SysLinux, IsoLinux and PXELinux bootloader</Summary>
         <Description>Lightweight bootloaders for floppy media (SYSLINUX), network booting (PXELINUX), and bootable "El Torito" CD-ROMs (ISOLINUX). The project also includes MEMDISK, a tool to boot legacy operating systems (such as DOS) from nontraditional media; it is usually used in conjunction with PXELINUX and ISOLINUX.</Description>
-        <Archive sha1sum="ceda70713fd575bd46fc497b503ed90f121ab3b1" type="tarxz">https://www.kernel.org/pub/linux/utils/boot/syslinux/4.xx/syslinux-4.07.tar.xz</Archive>
+        <Archive sha1sum="1bea76b97b4e32a017dd4168e819934b7c6592cc" type="tarxz">https://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-6.03.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>nasm</Dependency>
+            <Dependency>glibc-32bit</Dependency>
+            <Dependency>asciidoc</Dependency>
+            <Dependency>efibootmgr-devel</Dependency>
+            <Dependency>upx</Dependency><!--1-->
             <Dependency>libutil-linux-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch level="1">nopie.patch</Patch>
-            <Patch level="1">fixisohybrid.patch</Patch>
+            <Patch level="1">0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch</Patch>
+            <Patch level="1">0035-SYSAPPEND-Fix-space-stripping.patch</Patch>
+            <Patch level="1">gcc-fix-alignment.patch</Patch>
+            <Patch level="1">dont-guess-alignment.patch</Patch>
+            <Patch level="1">btrfs-fix.patch</Patch>
         </Patches>
     </Source>
 
@@ -28,7 +35,12 @@
         <Name>syslinux</Name>
         <RuntimeDependencies>
             <Dependency>mtools</Dependency>
-	    <Dependency>libutil-linux</Dependency>
+            <Dependency>libutil-linux</Dependency>
+            <Dependency>mtools</Dependency>
+            <Dependency>efibootmgr</Dependency>
+            <Dependency>util-linux</Dependency>
+            <Dependency>dosfstools</Dependency>
+            <Dependency>gptfdisk</Dependency>
             <Dependency>perl-Crypt-PasswdMD5</Dependency>
             <Dependency>perl-Digest-SHA1</Dependency>
         </RuntimeDependencies>
@@ -42,13 +54,14 @@
         <AdditionalFiles>
             <AdditionalFile target="/usr/lib/syslinux/isolinux.cfg" permission="0644" owner="root">pisi-iso/isolinux.cfg</AdditionalFile>
             <AdditionalFile target="/usr/lib/syslinux/background.png" permission="0644" owner="root">pisi-iso/background.png</AdditionalFile>
+            <!--AdditionalFile target="/usr/bin/syslinux-install_update" permission="0755" owner="root">syslinux-install_update</AdditionalFile-->
         </AdditionalFiles>
     </Package>
 
     <History>
         <Update release="1">
-            <Date>2014-06-14</Date>
-            <Version>4.07</Version>
+            <Date>2016-04-02</Date>
+            <Version>6.03</Version>
             <Comment>First release</Comment>
             <Name>Alihan Öztürk</Name>
             <Email>alihan@pisilinux.org</Email>