diff --git a/CHANGELOG.md b/CHANGELOG.md
index a67d42f160..58dc91faf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,29 @@
-## 0.24.2-dev
+## 0.25.0
+* Fix crash if a code reference ambiguously referred to a parameter of
+  an optional function parameter (#1835, #1841)
+* Allow annotations that return the dynamic type (#1834, #1840)
+* Better error messages in the case of a package with no documentable
+  libraries (#1832)
+* Fix a problem where the reexport tagger could trigger stack overflow
+  if a library exported itself (#1832, #1838)
+* Performance-related refactorings to return some of the performance lost
+  with macro templates in private libraries (#1828, #1829, #1831, #1837)
+* Fix several Flutter problems (#1819)
+  * Fix assertion failure if macros are defined in packages with no public
+    libraries
+  * Allow declaring macro templates in private libraries
+  * Avoid circular dependency in finding special objects
+  * Populate reference cache with child elements of mixins (fixes ~45 links
+    inside Flutter)
 * Added support for automatic snapshotting of external tools (i.e. for {@tool}
-  directives) written in Dart. 
+  directives) written in Dart. (#1820)
+* Changes to reduce use of internal APIs in analyzer (#1817, #1825)
+* Template text now appears where it is defined in addition to where it is
+  referenced (#1812)
+* Change placeholder string in search box to 'Search API Docs'
+* Fix some instances where macros were not being resolved correctly (#1811)
+* Macro templates now appear where they are defined in addition to where
+  they are referenced (#1810)
 
 ## 0.24.1
 * Added more metadata (element name, project name, etc.) to external tool invocations.
diff --git a/lib/src/version.dart b/lib/src/version.dart
index 8dd5cb3ebc..6cd4877306 100644
--- a/lib/src/version.dart
+++ b/lib/src/version.dart
@@ -1,2 +1,2 @@
 // Generated code. Do not modify.
-const packageVersion = '0.24.2-dev';
+const packageVersion = '0.25.0';
diff --git a/pubspec.yaml b/pubspec.yaml
index 320dbb0298..bd1d661823 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,14 +1,14 @@
 name: dartdoc
 # Also update the `version` field in lib/dartdoc.dart.
-version: 0.24.2-dev
+version: 0.25.0
 author: Dart Team <misc@dartlang.org>
 description: A documentation generator for Dart.
 homepage: https://github.com/dart-lang/dartdoc
 environment:
-  sdk: '>=2.0.0 <3.0.0'
+  sdk: '>=2.1.0-dev.9.4 <3.0.0'
 
 dependencies:
-  analyzer: ^0.33.3+1
+  analyzer: ^0.33.3+2
   args: '>=1.4.1 <2.0.0'
   collection: ^1.2.0
   crypto: ^2.0.6
diff --git a/testing/test_package_docs/__404error.html b/testing/test_package_docs/__404error.html
index 0e857d20e1..a30d6a9848 100644
--- a/testing/test_package_docs/__404error.html
+++ b/testing/test_package_docs/__404error.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.24.2-dev">
+  <meta name="generator" content="made with love by dartdoc 0.25.0">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>
 
diff --git a/testing/test_package_docs/index.html b/testing/test_package_docs/index.html
index 238597a627..bed661f90f 100644
--- a/testing/test_package_docs/index.html
+++ b/testing/test_package_docs/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.24.2-dev">
+  <meta name="generator" content="made with love by dartdoc 0.25.0">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>
 
diff --git a/testing/test_package_docs_dev/__404error.html b/testing/test_package_docs_dev/__404error.html
index 0e857d20e1..a30d6a9848 100644
--- a/testing/test_package_docs_dev/__404error.html
+++ b/testing/test_package_docs_dev/__404error.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.24.2-dev">
+  <meta name="generator" content="made with love by dartdoc 0.25.0">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>
 
diff --git a/testing/test_package_docs_dev/index.html b/testing/test_package_docs_dev/index.html
index 238597a627..bed661f90f 100644
--- a/testing/test_package_docs_dev/index.html
+++ b/testing/test_package_docs_dev/index.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <meta name="generator" content="made with love by dartdoc 0.24.2-dev">
+  <meta name="generator" content="made with love by dartdoc 0.25.0">
   <meta name="description" content="test_package API docs, for the Dart programming language.">
   <title>test_package - Dart API docs</title>