diff --git a/files/config b/files/config
--- a/files/config
+++ b/files/config
@@ -2,7 +2,6 @@
 
 mk_add_options MOZ_MAKE_FLAGS="##JOBCOUNT##"
 mk_add_options MZ_OBJDIR=@TOPSRCDIR@/firefox/build-dir
-ac_add_options MOZ_PGO=1
 
 ac_add_options --prefix=/usr
 
@@ -34,6 +33,5 @@
 ac_add_options --enable-system-ffi
 ac_add_options --enable-system-pixman
 
-ac_add_options --enable-lto=cross
 ac_add_options --enable-linker=lld
 
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
 name       : firefox
 version    : 74.0
-release    : 186
+release    : 187
 source     :
     - https://ftp.mozilla.org/pub/firefox/releases/74.0/source/firefox-74.0.source.tar.xz : 74589c2836d7c30134636823c3caefbcaed0ea7c3abb2def9e3ddd9f86d9440a
     - https://getsol.us/sources/mozilla/firefox-74.0-langpacks.tar.xz : af3e48c566f7ac546e239e2b260746bb0f37c7379ef042cab344c5cccb092093
@@ -50,10 +50,27 @@
     pushd third_party/python/psutil/
     patch -p1 < $pkgfiles/Future-proof-disk_io_counters.patch
     popd
-
-    ./mach configure
 build      : |
-    xvfb-run -a -n 55 -s "-screen 0 1024x768x24 -ac +extension GLX +render -noreset" ./mach build
+    # Instrument build
+    echo "ac_add_options --enable-profile-generate=cross" >> .mozconfig
+    ./mach build
+
+    # Package and run automated benchmarks for profiling
+    ./mach package
+    LLVM_PROFDATA=llvm-profdata JARLOG_FILE="$PWD/jarlog" xvfb-run -s "-screen 0 1920x1080x24 -ac +extension GLX +render -noreset" \
+    ./mach python build/pgo/profileserver.py
+
+    # Clean for rebuild
+    ./mach clobber
+
+    # Profile use build and enable lto
+    sed -i '/--enable-profile-generate=cross/d' .mozconfig
+    echo "ac_add_options --enable-lto=cross" >> .mozconfig
+    echo "ac_add_options --enable-profile-use=cross" >> .mozconfig
+    echo "ac_add_options --with-pgo-profile-path=${PWD@Q}/merged.profdata" >> .mozconfig
+    echo "ac_add_options --with-pgo-jarlog=${PWD@Q}/jarlog" >> .mozconfig
+    ./mach build
+
     ./mach buildsymbols
 install    : |
     # Install locales first
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>firefox</Name>
         <Packager>
-            <Name>Pierre-Yves</Name>
-            <Email>pyu@riseup.net</Email>
+            <Name>Joey Riches</Name>
+            <Email>josephriches@gmail.com</Email>
         </Packager>
         <License>GPL-2.0-or-later</License>
         <License>MPL-2.0</License>
@@ -175,12 +175,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="186">
-            <Date>2020-03-10</Date>
+        <Update release="187">
+            <Date>2020-03-18</Date>
             <Version>74.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Pierre-Yves</Name>
-            <Email>pyu@riseup.net</Email>
+            <Name>Joey Riches</Name>
+            <Email>josephriches@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file