diff --git a/network/web/firefox/actions.py b/network/web/firefox/actions.py
index c2bc4ad1cc..521c1c8400 100755
--- a/network/web/firefox/actions.py
+++ b/network/web/firefox/actions.py
@@ -17,6 +17,7 @@ arch = get.ARCH()
 ver = ".".join(get.srcVERSION().split(".")[:3])
 
 shelltools.export("SHELL", "/bin/sh")
+shelltools.export("MOZBUILD_STATE_PATH", "/mozbuild")
 
 def setup():
     # Google API key
diff --git a/network/web/firefox/files/mozconfig b/network/web/firefox/files/mozconfig
index e1f1d78a97..de3790010c 100755
--- a/network/web/firefox/files/mozconfig
+++ b/network/web/firefox/files/mozconfig
@@ -7,6 +7,12 @@ ac_add_options --enable-release
 ac_add_options --enable-hardening
 ac_add_options --enable-optimize
 
+export CC=clang
+export CXX=clang++
+export AR=llvm-ar
+export NM=llvm-nm
+export RANLIB=llvm-ranlib
+
 ac_add_options --enable-official-branding
 
 # System libraries
diff --git a/network/web/firefox/pspec.xml b/network/web/firefox/pspec.xml
index cd5a87e7f1..ce824c5c9d 100755
--- a/network/web/firefox/pspec.xml
+++ b/network/web/firefox/pspec.xml
@@ -15,7 +15,7 @@
         <IsA>app:gui</IsA>
         <Summary>Firefox Web Browser</Summary>
         <Description>It is more secure and faster to browse the web with Firefox web browser. You can personalize your web browser with many specifications that is not enough to explain in two sentences.</Description>
-        <Archive sha1sum="6b29f42ad43264ceb45bc42fa9f8a227339b3f1f" type="tarxz">https://ftp.mozilla.org/pub/firefox/releases/63.0.3/source/firefox-63.0.3.source.tar.xz</Archive>
+        <Archive sha1sum="2a484615aea59fb4b01931d49f0043de0a543aaa" type="tarxz">https://ftp.mozilla.org/pub/firefox/releases/64.0/source/firefox-64.0.source.tar.xz</Archive>
         <AdditionalFiles>
             <!--Our main configure script. Configure paramters are stored here.-->
             <AdditionalFile target=".mozconfig" permission="0644">mozconfig</AdditionalFile>
@@ -546,6 +546,13 @@
     </Package>
 
     <History>
+        <Update release="21">
+            <Date>2018-12-11</Date>
+            <Version>64.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="20">
             <Date>2018-11-17</Date>
             <Version>63.0.3</Version>