diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index e385af6dba7..d124b2d8e31 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7705
\ No newline at end of file
+7706
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm
index 17a3e93336b..4c22d0612f2 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl.pm
@@ -62,6 +62,7 @@ use constant SUB_CLASSES => qw(
     Bugzilla::BugUrl::Google
     Bugzilla::BugUrl::Debian
     Bugzilla::BugUrl::JIRA
+    Bugzilla::BugUrl::Trac
 );
 
 ###############################
diff --git a/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Trac.pm b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Trac.pm
new file mode 100644
index 00000000000..638bd779e95
--- /dev/null
+++ b/mozilla/webtools/bugzilla/Bugzilla/BugUrl/Trac.pm
@@ -0,0 +1,54 @@
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is the Bugzilla Bug Tracking System.
+#
+# The Initial Developer of the Original Code is Matt Selsky
+# Portions created by Matt Selsky are Copyright (C) 2010
+# Matt Selsky. All Rights Reserved.
+#
+# Contributor(s): Matt Selsky <selsky@columbia.edu>
+
+package Bugzilla::BugUrl::Trac;
+use strict;
+use base qw(Bugzilla::BugUrl);
+
+use Bugzilla::Error;
+use Bugzilla::Util;
+
+###############################
+####        Methods        ####
+###############################
+
+sub should_handle {
+    my ($class, $uri) = @_;
+    return ($uri->path =~ m|/ticket/\d+$|) ? 1 : 0;
+}
+
+sub _check_value {
+    my $class = shift;
+
+    my $uri = $class->SUPER::_check_value(@_);
+
+    # Trac URLs can look like various things:
+    #   http://dev.mutt.org/trac/ticket/1234
+    #   http://trac.roundcube.net/ticket/1484130
+
+    # Make sure there are no query parameters.
+    $uri->query(undef);
+    # And remove any # part if there is one.
+    $uri->fragment(undef);
+
+    return $uri;
+}
+
+1;
diff --git a/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
index 69394bec918..0c345f359a4 100644
--- a/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
+++ b/mozilla/webtools/bugzilla/template/en/default/global/user-error.html.tmpl
@@ -256,6 +256,7 @@
         <li>An issue on code.google.com.</li>
         <li>A b[% %]ug on b[% %]ugs.debian.org.</li>
         <li>An issue in a JIRA installation.</li>
+        <li>A ticket in a Trac installation.</li>
       </ul>
     [% ELSIF reason == 'id' %]
       There is no valid [% terms.bug %] id in that URL.