diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
index bef0050bd..0990c7f54 100644
--- a/Documentation/Changelog.md
+++ b/Documentation/Changelog.md
@@ -30,6 +30,7 @@
 
 For more details, please refer to:
 
+* [MariaDB MaxScale 2.3.2 Release Notes](Release-Notes/MaxScale-2.3.2-Release-Notes.md)
 * [MariaDB MaxScale 2.3.1 Release Notes](Release-Notes/MaxScale-2.3.1-Release-Notes.md)
 * [MariaDB MaxScale 2.3.0 Release Notes](Release-Notes/MaxScale-2.3.0-Release-Notes.md)
 
diff --git a/Documentation/Getting-Started/Configuration-Guide.md b/Documentation/Getting-Started/Configuration-Guide.md
index 5d72b0754..d93202f73 100644
--- a/Documentation/Getting-Started/Configuration-Guide.md
+++ b/Documentation/Getting-Started/Configuration-Guide.md
@@ -1988,9 +1988,3 @@ enabled MaxScale will check that all threads are running and notify systemd
 with a "keep-alive ping".
 
 Systemd reference: https://www.freedesktop.org/software/systemd/man/systemd.service.html
-
-*NOTE*: In 2.3.1 there is a deficiency that manifests itself so that if
-_any_ administrative operation, performed using _maxctrl_ or _maxadmin_,
-takes longer that the specified watchdog timeout, then the watchdog will
-kill and restart MaxScale. Please take that into account before enabling
-the watchdog.
diff --git a/Documentation/Release-Notes/MaxScale-2.3.2-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.3.2-Release-Notes.md
new file mode 100644
index 000000000..eab0a9881
--- /dev/null
+++ b/Documentation/Release-Notes/MaxScale-2.3.2-Release-Notes.md
@@ -0,0 +1,39 @@
+# MariaDB MaxScale 2.3.2 Release Notes
+
+Release 2.3.2 is a XXX release.
+
+This document describes the changes in release 2.3.2, when compared to the
+previous release in the same series.
+
+For any problems you encounter, please consider submitting a bug
+report on [our Jira](https://jira.mariadb.org/projects/MXS).
+
+## Changed Features
+
+### Watchdog
+
+The systemd watchdog is now safe to use in all circumstances.
+
+By default it is enabled with a timeout of 60 seconds.
+
+## Bug fixes
+
+## Known Issues and Limitations
+
+There are some limitations and known issues within this version of MaxScale.
+For more information, please refer to the [Limitations](../About/Limitations.md) document.
+
+## Packaging
+
+RPM and Debian packages are provided for supported the Linux distributions.
+
+Packages can be downloaded [here](https://mariadb.com/downloads/mariadb-tx/maxscale).
+
+## Source Code
+
+The source code of MaxScale is tagged at GitHub with a tag, which is identical
+with the version of MaxScale. For instance, the tag of version X.Y.Z of MaxScale
+is `maxscale-X.Y.Z`. Further, the default branch is always the latest GA version
+of MaxScale.
+
+The source code is available [here](https://github.com/mariadb-corporation/MaxScale).
diff --git a/etc/maxscale.service.in b/etc/maxscale.service.in
index 283de5038..4f335ed41 100644
--- a/etc/maxscale.service.in
+++ b/etc/maxscale.service.in
@@ -20,9 +20,7 @@ ExecStart=@CMAKE_INSTALL_PREFIX@/@MAXSCALE_BINDIR@/maxscale
 TimeoutStartSec=120
 LimitNOFILE=65535
 StartLimitBurst=0
-#Please see the MaxScale release notes and/or watchdog documentation
-#before turning the watchdog on.
-#WatchdogSec=60s
+WatchdogSec=60s
 
 # Only relevant when MaxScale is linked with -fsanitize=address
 Environment=ASAN_OPTIONS=abort_on_error=1