diff --git a/git_cl.py b/git_cl.py
index 4acbed581..07ecd32ee 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -395,6 +395,9 @@ class Settings(object):
       self.viewvc_url = self._GetConfig('rietveld.viewvc-url', error_ok=True)
     return self.viewvc_url
 
+  def GetBugPrefix(self):
+    return self._GetConfig('rietveld.bug-prefix', error_ok=True)
+
   def GetDefaultCCList(self):
     return self._GetConfig('rietveld.cc', error_ok=True)
 
@@ -865,6 +868,7 @@ def GetCodereviewSettingsInteractively():
   SetProperty(settings.GetTreeStatusUrl(error_ok=True), 'Tree status URL',
               'tree-status-url', False)
   SetProperty(settings.GetViewVCUrl(), 'ViewVC URL', 'viewvc-url', True)
+  SetProperty(settings.GetBugPrefix(), 'Bug Prefix', 'bug-prefix', False)
 
   # TODO: configure a default branch to diff against, rather than this
   # svn-based hackery.
@@ -949,7 +953,7 @@ class ChangeDescription(object):
 
     regexp = re.compile(self.BUG_LINE)
     if not any((regexp.match(line) for line in self._description_lines)):
-      self.append_footer('BUG=')
+      self.append_footer('BUG=%s' % settings.GetBugPrefix())
     content = gclient_utils.RunEditor(self.description, True,
                                       git_editor=settings.GetGitEditor())
     if not content:
@@ -1032,6 +1036,7 @@ def LoadCodereviewSettingsFromFile(fileobj):
   SetProperty('private', 'PRIVATE', unset_error_ok=True)
   SetProperty('tree-status-url', 'STATUS', unset_error_ok=True)
   SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True)
+  SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True)
 
   if 'GERRIT_HOST' in keyvals:
     RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']])
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index d29dd3889..1be529000 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -178,6 +178,7 @@ class TestGitCl(TestCase):
       ((['git', 'log', '--pretty=format:%s\n\n%b',
          'fake_ancestor_sha..HEAD'],),
        'desc\n'),
+      ((['git', 'config', 'rietveld.bug-prefix'],), ''),
     ]
 
   @classmethod
@@ -671,6 +672,8 @@ class TestGitCl(TestCase):
            'rietveld.tree-status-url'],), ''),
         ((['git', 'config', '--unset-all',
            'rietveld.viewvc-url'],), ''),
+        ((['git', 'config', '--unset-all',
+           'rietveld.bug-prefix'],), ''),
         ((['git', 'config', 'gerrit.host',
            'gerrit.chromium.org'],), ''),
         # DownloadHooks(False)
@@ -696,6 +699,8 @@ class TestGitCl(TestCase):
         ((['git', 'config', 'rietveld.viewvc-url'],), ''),
         (('ViewVC URL:',), ''),
         # DownloadHooks(True)
+        ((['git', 'config', 'rietveld.bug-prefix'],), ''),
+        (('Bug Prefix:',), ''),
         ((commit_msg_path, os.X_OK,), True),
         ]
     git_cl.main(['config'])