diff --git a/.travis.yml b/.travis.yml
index da58f76..8b6048d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,6 @@ language: dart
 sudo: false
 dart:
   - dev
-  - stable
 dart_task:
   - test
   - dartfmt
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 043c412..1e3f9a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 0.9.6
+
+* Updates to support Dart 2.0 core library changes (wave
+  2.2). See [issue 31847][sdk#31847] for details.
+  
+  [sdk#31847]: https://github.com/dart-lang/sdk/issues/31847
+
 # 0.9.5
 
 * Add support for the WebAssembly format.
diff --git a/lib/src/mime_multipart_transformer.dart b/lib/src/mime_multipart_transformer.dart
index ba1a5ae..a71e6d9 100644
--- a/lib/src/mime_multipart_transformer.dart
+++ b/lib/src/mime_multipart_transformer.dart
@@ -30,7 +30,7 @@ Uint8List _getBoundary(String boundary) {
  * of them streaming the multipart data.
  */
 class MimeMultipartTransformer
-    implements StreamTransformer<List<int>, MimeMultipart> {
+    extends StreamTransformerBase<List<int>, MimeMultipart> {
   final List<int> _boundary;
 
   /**
diff --git a/pubspec.yaml b/pubspec.yaml
index 75f0457..1811771 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,9 +1,9 @@
 name: mime
-version: 0.9.5
+version: 0.9.6
 author: Dart Team <misc@dartlang.org>
 description: Helper-package for working with MIME.
 homepage: https://www.github.com/dart-lang/mime
 environment:
-  sdk: '>=1.8.3 <2.0.0'
+  sdk: '>=2.0.0-dev.20.0 <2.0.0'
 dev_dependencies:
   test: '^0.12.0'