diff --git a/CHANGELOG.md b/CHANGELOG.md
index 407eb7b..a22da71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.6.1] - 2021-11-16
+### Fixed
+- Gracefully handle the hot-reloading errors.
+  - Errors that may occur while locking the [Mutex](https://doc.rust-lang.org/std/sync/struct.Mutex.html) are handled properly hence a single configuration change cannot take down the whole service due to [poisoning](https://doc.rust-lang.org/std/sync/struct.Mutex.html#poisoning).
+
 ## [0.6.0] - 2021-11-07
 ### Added
 - Support pasting files from remote URLs (via `remote=` form field)
diff --git a/Cargo.lock b/Cargo.lock
index b2b1f7b..371425d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1658,7 +1658,7 @@ dependencies = [
 
 [[package]]
 name = "rustypaste"
-version = "0.6.0"
+version = "0.6.1"
 dependencies = [
  "actix-files",
  "actix-multipart",
diff --git a/Cargo.toml b/Cargo.toml
index 5933a0d..522cc01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustypaste"
-version = "0.6.0"
+version = "0.6.1"
 edition = "2021"
 description = "A minimal file upload/pastebin service"
 authors = ["Orhun Parmaksız <orhunparmaksiz@gmail.com>"]