--- a/python/mozboot/mozboot/freebsd.py
+++ b/python/mozboot/mozboot/freebsd.py
@@ -21,28 +21,25 @@ class FreeBSDBootstrapper(BaseBootstrapp
             'zip',
         ]
 
         self.browser_packages = [
             'dbus-glib',
             'gconf2',
             'gtk2',
             'gtk3',
+            'llvm40',
             'pulseaudio',
             'v4l_compat',
             'yasm',
         ]
 
         if not self.which('unzip'):
             self.packages.append('unzip')
 
-        # GCC 4.2 or Clang 3.4 in base are too old
-        if self.flavor == 'freebsd' and self.version < 11:
-            self.browser_packages.append('gcc')
-
     def pkg_install(self, *packages):
         command = ['pkg', 'install']
         if self.no_interactive:
             command.append('-y')
 
         command.extend(packages)
         self.run_as_root(command)
 
@@ -55,12 +52,13 @@ class FreeBSDBootstrapper(BaseBootstrapp
     def install_browser_artifact_mode_packages(self):
         self.ensure_browser_packages(artifact_mode=True)
 
     def ensure_browser_packages(self, artifact_mode=False):
         # TODO: Figure out what not to install for artifact mode
         self.pkg_install(*self.browser_packages)
 
     def ensure_stylo_packages(self, state_dir, checkout_root):
-        self.pkg_install('llvm40')
+        # Already installed as browser package
+        pass
 
     def upgrade_mercurial(self, current):
         self.pkg_install('mercurial')