diff --git a/doc/changelog.dox b/doc/changelog.dox
index db1db272e..674bcc38c 100644
--- a/doc/changelog.dox
+++ b/doc/changelog.dox
@@ -111,6 +111,11 @@ See also:
 -   The @cb{.cmake} android_create_apk() @ce macro for
     @ref platforms-android-apps-cmake "Gradle-less Android builds" now properly
     creates the library output directory beforehand
+-   Updated the `base-qt` bootstrap project to correctly reset state tracker
+    when going from and back to Qt code, and to use the framebuffer provided by
+    Qt instead of @ref GL::defaultFramebuffer (see
+    [mosra/magnum#322](https://github.com/mosra/magnum/issues/322) and
+    [mosra/magnum-bootstrap#15](https://github.com/mosra/magnum-bootstrap/pull/15))
 
 @subsection changelog-latest-deprecated Deprecated APIs
 
diff --git a/doc/credits.dox b/doc/credits.dox
index 49a47db70..25ae54cdb 100644
--- a/doc/credits.dox
+++ b/doc/credits.dox
@@ -144,6 +144,8 @@ Are the below lists missing your name or something's wrong?
     and GLES fixes
 -   **Samuel Kogler** ([\@skogler](https://github.com/skogler)) ---
     @ref Platform::GlfwApplication crash fixes
+-   **[\@Selot](https://github.com/Selot)** --- Fixes in the `base-qt`
+    bootstrap project
 -   **Séverin Lemaignan** ([\@severin-lemaignan](severin-lemaignan/)) --- lots
     of feedback and bug reports for the initial releases
 -   **[\@sigman78](https://github.com/sigman78)** --- Initial MSVC 2017 port,