diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6baafe0..a2e566c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,54 +3,65 @@
 For a full change history, see the Git history. Only changes likely to affect
 end users will be listed here.
 
+## 0.x
+
+Pre-release development. This is reasonably stable, but APIs are subject to
+change.
+
 ### 0.6.0
 
-   * Add new operations to flatten observable collections.
-   * Updates to several dependencies.
-      * This includes Shapeless 2.3.0, which may introduce binary
-        incompatibilities if you have compiled against a different version.
+* Add new operations to flatten observable collections.
+* Updates to several dependencies.
+  * This includes Shapeless 2.3.0, which may introduce binary
+    incompatibilities if you have compiled against a different version.
 
 ### 0.7.0
 
-   * Modified Scalaz instance to add `ReadOnlyObjectProperty` instances and
-     improve specificity of the `ObservableValue[A, _]` instances.
+* Modified Scalaz instance to add `ReadOnlyObjectProperty` instances and
+  improve specificity of the `ObservableValue[A, _]` instances.
 
 ### 0.8.0
 
-   * Update ScalaFX to 8.0.92-R10.
-      * This makes Java 1.8.0_91 the minimum version.
-   * `FutureObservable` allows you to observe the results of a `Future`.
-   * New `AkkaFX` object gives bridges from Akka to ScalaFX
-      * `observableSink` creates a Akka Streams sink that allows you to
-        observe each value that comes through a stream.
+* Update ScalaFX to 8.0.92-R10.
+  * This makes Java 1.8.0_91 the minimum version.
+* `FutureObservable` allows you to observe the results of a `Future`.
+* New `AkkaFX` object gives bridges from Akka to ScalaFX
+  * `observableSink` creates a Akka Streams sink that allows you to
+    observe each value that comes through a stream.
 
 ### 0.9.0
 
-   * This release is not binary compatible with 0.8 or earlier.
-   * Add more controls for filtering items.
+* This release is not binary compatible with 0.8 or earlier.
+* Add more controls for filtering items.
 
 #### 0.9.1
 
-   * Add control panel builders: simple utility code for building control
-     panels
+* Add control panel builders: simple utility code for building control
+  panels
 
 ### 0.10.0
 
-   * Breaking changes to `SingletonStage` for better naming and visibility.
-   * New `layout` package with `Anchored` pane for resizable stages.
-   * New `StringConverters` with standard converter types.
+* Breaking changes to `SingletonStage` for better naming and visibility.
+* New `layout` package with `Anchored` pane for resizable stages.
+* New `StringConverters` with standard converter types.
 
 ### 0.11.0
 
-   * Update to ScalaFX 8.0.102-R11.
-      * This makes Java 1.8.0_101 the official minimum version.
-   * Reorganize the build to meet SBT 1.0 guidelines.
+* Update to ScalaFX 8.0.102-R11.
+  * This makes Java 1.8.0_101 the official minimum version.
+* Reorganize the build to meet SBT 1.0 guidelines.
 
 #### 0.11.1
 
-   * Update to Akka 2.4.11.
+* Update to Akka 2.4.11.
 
 #### 0.11.2
 
-   * Update to Akka 2.4.14.
-   * Add support for Scala 2.12
+* Update to Akka 2.4.14.
+* Add support for Scala 2.12
+
+### 0.12
+
+* Update to Akka 2.5
+* Migrate to SBT 1.0
+* Improvements to `SingletonStage`
diff --git a/version.sbt b/version.sbt
index 725426c..12dd689 100644
--- a/version.sbt
+++ b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "0.11.3-SNAPSHOT"
+version in ThisBuild := "0.12.0-SNAPSHOT"