diff --git a/system/boot/grub2/actions.py b/system/boot/grub2/actions.py
index 35b4f060..ae7def9b 100644
--- a/system/boot/grub2/actions.py
+++ b/system/boot/grub2/actions.py
@@ -9,7 +9,11 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 
+WorkDir="grub-%s" % (get.srcVERSION().replace("_", "~"))
+
+
 def setup():
+    
     shelltools.copy("../unifont*.bdf", "./unifont.bdf")
     shelltools.export("GRUB_CONTRIB", "%s/grub-%s/grub-extras" % (get.workDIR(), get.srcVERSION()))
 
@@ -22,12 +26,33 @@ def setup():
                          --with-grubdir=grub2 \
                          --program-transform-name='s,grub,grub2,'\
                          --program-prefix= \
+                         --with-platform=pc \
+                         --target='i386' \
                          --htmldir='/usr/share/doc/grub2/html' ")
-
+    
+    
+    shelltools.copytree("../grub-%s" % (get.srcVERSION().replace("_", "~")), "../grub-%s-efi" % get.srcVERSION())
+    shelltools.cd("../grub-%s-efi" % get.srcVERSION())
+    shelltools.system("./autogen.sh")
+    autotools.configure("--disable-werror \
+                         --with-grubdir=grub2 \
+                         --program-transform-name='s,grub,grub2,'\
+                         --program-prefix= \
+                         --with-platform=efi \
+                         --target=x86_64  \
+                         --htmldir='/usr/share/doc/grub2/html' ")
+    
+    
+    shelltools.cd("..")
+    
+    
 def build():
     #make-dist for creating all updated translation files
     autotools.make("dist")
     autotools.make()
+    shelltools.cd("../grub-%s-efi" % get.srcVERSION())
+    autotools.make()
+    shelltools.cd("..")
 
 def install():
     # Install unicode.pf2 using downloaded font source. 
@@ -35,6 +60,7 @@ def install():
 
     # Create directory for grub.cfg file
     pisitools.dodir("/boot/grub2")
+    
     pisitools.insinto("/boot/grub2", "unicode.pf2")
 
     # Insall our theme
@@ -56,7 +82,15 @@ def install():
 
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    #Remove default starfiled theme.
-    # pisitools.removeDir("/usr/share/grub/themes/starfield")
-
     pisitools.dodoc("ABOUT-NLS", "AUTHORS", "BUGS", "ChangeLog", "COPYING", "TODO", "README")
+    
+    shelltools.cd("../grub-%s-efi" % get.srcVERSION())
+    
+    autotools.rawInstall("DESTDIR=%s/efi" % get.installDIR())
+    
+    
+    shelltools.copytree("/%s/efi/usr/lib/grub/x86_64-efi" % get.installDIR(), "%s/usr/lib/grub/x86_64-efi" % get.installDIR())
+    pisitools.removeDir("/efi")
+
+
+
diff --git a/system/boot/grub2/files/update-grub b/system/boot/grub2/files/update-grub
new file mode 100644
index 00000000..0597e351
--- /dev/null
+++ b/system/boot/grub2/files/update-grub
@@ -0,0 +1,2 @@
+#! /bin/sh
+grub2-mkconfig -o /boot/grub/grub.cfg
diff --git a/system/boot/grub2/pspec.xml b/system/boot/grub2/pspec.xml
index 2afcac16..be11493a 100644
--- a/system/boot/grub2/pspec.xml
+++ b/system/boot/grub2/pspec.xml
@@ -58,6 +58,7 @@
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="executable">/usr/sbin</Path>
             <Path fileType="library">/usr/lib/grub/i386-pc/</Path>
+            <Path fileType="library">/usr/lib/grub/x86_64-efi</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="data">/usr/share/grub</Path>
             <Path fileType="data">/usr/share/info</Path>
@@ -72,10 +73,18 @@
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/grub/pisi-grub-bg.png">pisi-grub-bg.png</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/etc/default/grub">grub-defaults</AdditionalFile>
+            <AdditionalFile owner="root" permission="0755" target="/usr/bin/update-grub">update-grub</AdditionalFile>
         </AdditionalFiles>
     </Package>
 
     <History>
+        <Update release="3">
+            <Date>2016-06-25</Date>
+            <Version>2.02_beta2</Version>
+            <Comment>Add efi</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="2">
             <Date>2016-04-27</Date>
             <Version>2.02_beta2</Version>