diff --git a/CHANGES.txt b/CHANGES.txt
index edabb21..e480d99 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-0.25.dev0 (Next Release)
-------------------------
+1.0.0 (2017-05-11)
+------------------
 
  - Fixed a bug where the ordering of ``py65mon`` command line arguments
    produced different results.  Arguments can now be specified in any
@@ -13,10 +13,12 @@
    the Z flag correctly.  Thanks to Kris Kennaway for reporting it.
 
 0.24 (2015-03-31)
+-----------------
 
  - Released as a universal wheel.
 
 0.23 (2015-02-10)
+-----------------
 
  - Added a workaround to $F001 output to catch encoding errors and
    display a "?" instead of crashing.  This condition can occur if
@@ -24,11 +26,13 @@
    the terminal's character encoding.
 
 0.22 (2015-02-09)
+-----------------
 
  - Fixed a bug where ``py65mon --rom`` would raise an exception
    on Python 3.
 
 0.21 (2015-02-09)
+-----------------
 
  - Added support for breakpoints in the monitor.  Contributed by
    Alessandro Gatti.
@@ -39,12 +43,14 @@
  - Fixed console input when run under Python 3 on Windows.  Closes #27.
 
 0.20 (2014-05-08)
+-----------------
 
   - Page wrapping for indexed indirect (X) operations on 65C02 has been
     restored.  This reverts the change introduced in 0.18.  We now believe
     that this mode works the same on the 65C02 as it does on the 6502.
 
 0.19 (2014-03-12)
+-----------------
 
   - Fixed 65C02 opcode $D2: CMP Zero Page, Indirect.
 
@@ -54,6 +60,7 @@
     on $F005 have been changed to use $F004.
 
 0.18 (2014-01-30)
+-----------------
 
   - Fixed a bug in RTS where popping $FFFF off the stack would cause
     the program counter to overflow to $10000.  It now wraps around
@@ -69,15 +76,18 @@
   - Removed page wrap bug from indexed indirect (X) operations on 65C02.
 
 0.17 (2013-10-26)
+-----------------
 
   - Added support for Python 3.2 and 3.3 based on work by David Beazley.
 
 0.16 (2013-04-03)
+-----------------
 
   - Fixed a bug in the monitor that caused loading from the command
     line with "--rom" to crash.
 
 0.15 (2013-01-06)
+-----------------
 
   - Disassembling can now wrap around memory if the start address
     given is greater than the end address.
@@ -86,6 +96,7 @@
     "start:end+1" for consistency with the other commands.
 
 0.14 (2012-11-30)
+-----------------
 
   - Assembling now detects syntax errors, overflows, and bad labels
     separately and shows specific error messages.
@@ -109,11 +120,13 @@
     the top of memory would not be displayed properly.
 
 0.13 (2012-11-15)
+-----------------
 
   - Fixed a bug where negative numbers could be entered
     for addresses in the monitor.
 
 0.12 (2012-02-16)
+-----------------
 
   - Fixed a bug that caused ``help cd`` to raise an exception
     in the monitor.
@@ -128,6 +141,7 @@
   - Added "h" as a monitor shortcut for "help".
 
 0.11 (2012-01-07)
+-----------------
 
   - Added a new 65Org16 MPU simulation written by Ed Spittles.
 
@@ -139,6 +153,7 @@
   - Python versions earlier than 2.6 are no longer supported.
 
 0.10 (2011-08-27)
+-----------------
 
   - Fixed long-standing bugs in relative branch calculations in the
     assembler and disassembler.  Based on a patch by Ed Spittles.
@@ -147,6 +162,7 @@
     Patch by Martti Kühne.
 
 0.9 (2011-03-27)
+----------------
 
   - Fixed two monitor tests that were broken under Windows.  Thanks
     to Oscar Lindberg for reporting this.
@@ -158,6 +174,7 @@
     the decimal handling code.
 
 0.8 (2010-03-08)
+----------------
 
   - Fixed deprecation warnings on Python 2.6
 
@@ -174,6 +191,7 @@
     consistency with VICE.
 
 0.7 (2009-09-03)
+----------------
 
   - When using the monitor, the nonblocking character input at
     $F004 should now work on the Microsoft Windows platform.
@@ -213,6 +231,7 @@
     a range of memory to a binary file.
 
 0.6 (2009-08-11)
+----------------
 
   - Added monitor shortcut "a" for "assemble".
 
@@ -226,6 +245,7 @@
     Closes #3.
 
 0.5 (2009-08-06)
+----------------
 
   - Fixed signatures of getc/putc callbacks in monitor that were broken
     when the ObservableMemory interface changed in 0.3.  Closes #1.
@@ -233,10 +253,12 @@
   - Fixed that ROL would not properly set the Z flag.  Closes #2.
 
 0.4 (2009-06-06)
+----------------
 
   - Added ez_setup.py to bootstrap setuptools installation.
 
 0.3 (2009-06-03)
+----------------
 
   - Added shortcuts for monitor commands such as "m" for "memory".  These
     are mostly the same as the VICE monitor shortcuts.
@@ -266,6 +288,7 @@
   - Python 2.4 or later is now required.
 
 0.2 (2008-11-09)
+----------------
 
   - Added a new "disassemble" command to the monitor.  It can disassemble
     any range of memory ("disassemble c000:c010").  If labels have been
@@ -292,5 +315,6 @@
     command "help command" for help on any command.
 
 0.1 (2008-11-21)
+----------------
 
   - First release.
diff --git a/docs/conf.py b/docs/conf.py
index 794718f..b76e503 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -13,8 +13,6 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
-import sys
 from datetime import date
 
 # If your extensions are in another directory, add it here. If the directory
@@ -51,7 +49,7 @@ copyright = u'2008-%d, Mike Naberezny and contributors' % year
 # built documents.
 #
 # The short X.Y version.
-version = '0.25.dev0'
+version = '1.0.0'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/setup.py b/setup.py
index fda84d2..fefbd4c 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-__version__ = '0.25.dev0'
+__version__ = '1.0.0'
 
 import sys