diff --git a/doc/changelog.dox b/doc/changelog.dox
index 4fe681949..8b2758020 100644
--- a/doc/changelog.dox
+++ b/doc/changelog.dox
@@ -126,7 +126,8 @@ See also:
 @subsection changelog-latest-buildsystem Build system
 
 -   Experimental support for creating Android APKs directly using CMake without
-    Gradle involved. See @ref platforms-android-apps for more information.
+    Gradle involved. See @ref platforms-android-apps for more information. See
+    also [mosra/toolchains#5](https://github.com/mosra/toolchains/pull/5).
 -   Initial scaffolding for [Hunter](https://hunter.sh) package support (see
     [mosra/magnum#298](https://github.com/mosra/magnum/pull/298))
 -   The `Magnum::AndroidApplication` target was missing a few dependency
@@ -134,6 +135,8 @@ See also:
 -   Fixed an ambiguous overload error in @ref Text::GlyphCache when compiling
     this library under C++17 (see
     [mosra/magnum#297](https://github.com/mosra/magnum/pull/297))
+-   Imroved initial Emscripten setup on Windows to be more frictionless (see
+    [mosra/toolchains#4](https://github.com/mosra/toolchains/pull/4))
 
 @subsection changelog-latest-bugfixes Bug fixes
 
@@ -1677,6 +1680,9 @@ a high-level overview.
     [mosra/magnum-examples#9](https://github.com/mosra/magnum-examples/issues/9))
 -   Bundling a patched version of `FindOpenAL.cmake` to make it working on
     Emscripten
+-   Fixed `EMSCRIPTEN` environment variable handling in Emscripten toolchains
+    (see [mosra/toolchains#2](https://github.com/mosra/toolchains/pull/2),
+    [mosra/toolchains#3](https://github.com/mosra/toolchains/issues/3))
 
 @subsection changelog-2018-02-bugfixes Bug fixes
 
diff --git a/doc/credits.dox b/doc/credits.dox
index 4fc01e77d..1d1a8ca23 100644
--- a/doc/credits.dox
+++ b/doc/credits.dox
@@ -111,7 +111,8 @@ Are the below lists missing your name or something's wrong?
     improvements
 -   **Jonathan Hale** ([\@Squareys](https://github.com/Squareys)) --- @ref Audio
     library enhancements, @ref Platform::GlfwApplication implementation,
-    frustum and cone culling, bug reports, documentation improvements
+    frustum and cone culling, bug reports, Windows build improvements,
+    documentation improvements and tons of other stuff
 -   **Joel Clay** ([\@jclay](https://github.com/jclay)) --- Vcpkg packages
 -   **Konstantinos Chatzilygeroudis** ([\@costashatz](https://github.com/costashatz))
     --- Debian package
diff --git a/doc/developers.dox b/doc/developers.dox
index e2a3350e4..da223c7e4 100644
--- a/doc/developers.dox
+++ b/doc/developers.dox
@@ -832,6 +832,7 @@ inverse.
     add a mention to the changelog), @m_span{m-label m-danger m-flat} scrapped @m_endspan
     or @m_span{m-label m-dim m-flat} no action needed @m_endspan label to wrap
     them up
+    -   Don't forget about the bootstrap repository and toolchains as well
 6.  Go through merged PRs (and the *most important* issues) and add new people
     to `CREDITS.md` and https://magnum.graphics/about/, if they are not there
     yet