diff --git a/ChangeLog b/ChangeLog
index 0acd1aeb6..0e2b5dcbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2004-09-17 James Vega <jamessan@users.sf.net>
+
+	* Version 0.80.0pre2!
+
+	* Added supybot.plugins.Google.colorfulSnarfer, which determines
+	whether the word 'google' in the bot's output will be made colorful
+	(like Google's logo).
+
+	* Added the Time plugin, to hold all of our Time related commands.
+
+	* Added max() and min() to Math.calc.
+	
+	* Added Unix.pid, which allows the Owner to retrieve the pid of the
+	bot's process.
+
+	* Added supybot.plugins.Sourceforge.enableSpecificTrackerCommands,
+	which enables the rfe, bug, and patch commands.
+
+	* Added Topic.topic, which returns the current topic of the channel.
+
+	* Updated conf.Databases to use a more sane database ordering and
+	include anydbm.
+
+	* Updated various plugins to use our new-style database abstraction.
+	Plugin databases using this new-style will be named Plugin.dbtype.db.
+
 2004-09-12 Jeremy Fincher <jemfinch@supybot.org>
 
 	* Version 0.80.0pre1!
diff --git a/RELNOTES b/RELNOTES
index 9855b8f75..01394ec44 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,3 +1,11 @@
+Version 0.80.0pre2
+
+Many more bugs have been fixed.  A few more plugins have been updated
+to use our new-style database abstraction.  If it seems like your
+databases are suddenly empty, look for a new database file named
+Plugin.dbtype.db.  We've also added a few more configuration variables.
+
+
 Version 0.80.0pre1
 
 Tons of bugs fixed, many features and plugins added.  Everything
diff --git a/scripts/supybot b/scripts/supybot
index bfeaf7b25..2129457eb 100755
--- a/scripts/supybot
+++ b/scripts/supybot
@@ -130,7 +130,7 @@ if __name__ == '__main__':
     # --connect (commands to run afterConnect)
     # --config (configuration values)
     parser = optparse.OptionParser(usage='Usage: %prog [options] configFile',
-                                   version='supybot 0.80.0pre1')
+                                   version='supybot 0.80.0pre2')
     parser.add_option('-P', '--profile', action='store_true', dest='profile',
                       help='enables profiling')
     parser.add_option('-O', action='count', dest='optimize',
diff --git a/setup.py b/setup.py
index 7ba0deda2..d5b5a9d69 100644
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,7 @@ if clean:
 setup(
     # Metadata
     name='supybot',
-    version='0.80.0pre1',
+    version='0.80.0pre2',
     author='Jeremy Fincher',
     url='http://supybot.sf.net/',
     author_email='jemfinch@users.sf.net',
diff --git a/src/conf.py b/src/conf.py
index b78e9b2ec..93fd3da07 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -50,7 +50,7 @@ _pluginsDir = os.path.join(installDir, 'plugins')
 ###
 # version: This should be pretty obvious.
 ###
-version ='0.80.0pre1'
+version ='0.80.0pre2'
 
 ###
 # *** The following variables are affected by command-line options.  They are