diff --git a/CHANGES.txt b/CHANGES.txt
index 11b9300..57fa33c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,10 +2,10 @@
 CHANGES
 =======
 
-3.6.0b1 (unreleased)
---------------------
+3.6.0 (2012-03-05)
+------------------
 
-- Fixed Python2.7 compatibility in Browser.handleErrors.
+- Fixed Python 2.7 compatibility in Browser.handleErrors.
 
 - Fixed LP #419119: return None when the browser has no contents instead of
   raising an exception.
diff --git a/setup.py b/setup.py
index 104b5e1..e3cfe92 100644
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@
 
 setup(
     name = 'zope.testbrowser',
-    version = '3.6.0b1dev',
+    version='3.6.0',
     url = 'http://pypi.python.org/pypi/zope.testbrowser',
     license = 'ZPL 2.1',
     description = 'Programmable browser for functional black-box tests',