diff --git a/conf/default.conf.php b/conf/default.conf.php
index e2f913c3aa..e441e130da 100644
--- a/conf/default.conf.php
+++ b/conf/default.conf.php
@@ -992,6 +992,7 @@ return array(
     'bash' => 'Bash Scripting',
     'brainfuck' => 'Brainf*ck',
     'c' => 'C',
+    'coffee-script' => 'CoffeeScript',
     'cpp' => 'C++',
     'css' => 'CSS',
     'd' => 'D',
@@ -999,14 +1000,18 @@ return array(
     'django' => 'Django Templating',
     'erb' => 'Embedded Ruby/ERB',
     'erlang' => 'Erlang',
+    'go' => 'Golang',
+    'groovy' => 'Groovy',
     'haskell' => 'Haskell',
     'html' => 'HTML',
     'java' => 'Java',
     'js' => 'Javascript',
+    'json' => 'JSON',
     'mysql' => 'MySQL',
     'objc' => 'Objective-C',
     'perl' => 'Perl',
     'php' => 'PHP',
+    'puppet' => 'Puppet',
     'rest' => 'reStructuredText',
     'text' => 'Plain Text',
     'python' => 'Python',
@@ -1014,6 +1019,7 @@ return array(
     'remarkup' => 'Remarkup',
     'ruby' => 'Ruby',
     'xml' => 'XML',
+    'yaml' => 'YAML',
   ),
 
   // This is an override list of regular expressions which allows you to choose
diff --git a/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php b/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php
index d810a155c7..4ce4725faa 100644
--- a/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php
+++ b/src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php
@@ -42,6 +42,7 @@ final class PhabricatorSyntaxHighlightingConfigOptions
           'bash' => 'Bash Scripting',
           'brainfuck' => 'Brainf*ck',
           'c' => 'C',
+          'coffee-script' => 'CoffeeScript',
           'cpp' => 'C++',
           'css' => 'CSS',
           'd' => 'D',
@@ -49,15 +50,19 @@ final class PhabricatorSyntaxHighlightingConfigOptions
           'django' => 'Django Templating',
           'erb' => 'Embedded Ruby/ERB',
           'erlang' => 'Erlang',
+          'go' => 'Golang',
+          'groovy' => 'Groovy',
           'haskell' => 'Haskell',
           'html' => 'HTML',
           'invisible' => 'Invisible',
           'java' => 'Java',
           'js' => 'Javascript',
+          'json' => 'JSON',
           'mysql' => 'MySQL',
           'objc' => 'Objective-C',
           'perl' => 'Perl',
           'php' => 'PHP',
+          'puppet' => 'Puppet',
           'rest' => 'reStructuredText',
           'text' => 'Plain Text',
           'python' => 'Python',
@@ -65,6 +70,7 @@ final class PhabricatorSyntaxHighlightingConfigOptions
           'remarkup' => 'Remarkup',
           'ruby' => 'Ruby',
           'xml' => 'XML',
+          'yaml' => 'YAML',
         ))
         ->setSummary(
           pht("Set the language list which appears in dropdowns."))