diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 7f777c4ee9f..8444cb2e30e 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7818
\ No newline at end of file
+7819
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/.gitrev b/mozilla/webtools/bugzilla/.gitrev
index 518b416da93..88308a504d8 100644
--- a/mozilla/webtools/bugzilla/.gitrev
+++ b/mozilla/webtools/bugzilla/.gitrev
@@ -1 +1 @@
-af5999ba1d1db9837c9c3084e649df7772c1581f
\ No newline at end of file
+f80ce0c0974010ba97b1467e764e5f2f239fe514
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Constants.pm b/mozilla/webtools/bugzilla/Bugzilla/Constants.pm
index be78b3e634d..21517d75ebf 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Constants.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Constants.pm
@@ -197,7 +197,7 @@ use File::Basename;
 # CONSTANTS
 #
 # Bugzilla version
-use constant BUGZILLA_VERSION => "4.0.17+";
+use constant BUGZILLA_VERSION => "4.0.18";
 
 # These are unique values that are unlikely to match a string or a number,
 # to be used in criteria for match() functions and other things. They start
diff --git a/mozilla/webtools/bugzilla/docs/en/xml/Bugzilla-Guide.xml b/mozilla/webtools/bugzilla/docs/en/xml/Bugzilla-Guide.xml
index 08ad2695690..8a3f42c34a4 100644
--- a/mozilla/webtools/bugzilla/docs/en/xml/Bugzilla-Guide.xml
+++ b/mozilla/webtools/bugzilla/docs/en/xml/Bugzilla-Guide.xml
@@ -32,9 +32,9 @@
      For a devel release, simple bump bz-ver and bz-date
 -->
 
-<!ENTITY bz-ver "4.0.17+">
+<!ENTITY bz-ver "4.0.18">
 <!ENTITY bz-nextver "4.2">
-<!ENTITY bz-date "2015-01-27">
+<!ENTITY bz-date "2015-04-15">
 <!ENTITY current-year "2015">
 
 <!ENTITY landfillbase "http://landfill.bugzilla.org/bugzilla-4.0-branch/">