diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bd9f983..fd65a663 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog #
 
+## 4.0.2 (Mar. 18, 2019) ##
+*   _Bugfix_: Don't whitescreen when the shortcode handler is called with an empty
+    string instead of argument array.
+*   _Bugfix_: Featured images can be set normally again when
+    `Do not credit images to WordPress users` is enabled.
+
 ## 4.0.1 (Mar. 11, 2019) ##
 *   _Bugfix_: Uploads via the Edit Post or New Post screens should work again.
 
diff --git a/readme.txt b/readme.txt
index d2df4ba1..e01a8270 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: media, image, images, credit, byline, author, user
 Requires at least: 5.0
 Requires PHP: 5.6
 Tested up to: 5.1
-Stable tag: 4.0.1
+Stable tag: 4.0.2
 License: GPLv2 or later
 
 Adds a "Credit" field when uploading media to posts and displays it under the images on your blog to properly credit the artist.
@@ -86,6 +86,10 @@ Feel free to get in touch with us about anything you'd like us to add to this li
 
 == Changelog ==
 
+= 4.0.2 (Mar. 18, 2019) =
+* _Bugfix_: Don't whitescreen when the shortcode handler is called with an empty string instead of argument array.
+* _Bugfix_: Featured images can be set normally again when `Do not credit images to WordPress users` is enabled.
+
 = 4.0.1 (Mar. 11, 2019) =
 * _Bugfix_: Uploads via the Edit Post or New Post screens should work again.