diff --git a/pglab/About.cpp b/pglab/About.cpp
index a38b4b1..75c1b84 100644
--- a/pglab/About.cpp
+++ b/pglab/About.cpp
@@ -1,7 +1,9 @@
 #include "About.h"
 #include <QCoreApplication>
+#include <QDesktopServices>
 #include <QMessageBox>
 #include <QString>
+#include <QUrl>
 
 void ShowAboutDialog(QWidget *parent)
 {
@@ -21,3 +23,8 @@ void ShowAboutDialog(QWidget *parent)
               "attribution 3.0 license.</p>"
               ).arg(year).arg(releaseNotesUrl).arg(pgLabVersionString));
 }
+
+void OpenManual()
+{
+    QDesktopServices::openUrl(QString("https://eelke.gitlab.io/pgLab/#pglab-user-manual"));
+}
diff --git a/pglab/About.h b/pglab/About.h
index 1274f37..4311556 100644
--- a/pglab/About.h
+++ b/pglab/About.h
@@ -3,3 +3,4 @@
 #include <QWidget>
 
 void ShowAboutDialog(QWidget *parent);
+void OpenManual();
diff --git a/pglab/ConnectionManagerWindow.cpp b/pglab/ConnectionManagerWindow.cpp
index 4411663..68a1a49 100644
--- a/pglab/ConnectionManagerWindow.cpp
+++ b/pglab/ConnectionManagerWindow.cpp
@@ -4,7 +4,6 @@
 #include "MasterController.h"
 #include "ConnectionController.h"
 #include "ConnectionListModel.h"
-#include <QDesktopServices>
 #include <QDir>
 #include <QMessageBox>
 #include <QStandardItemModel>
@@ -112,7 +111,7 @@ void ConnectionManagerWindow::on_actionAbout_triggered()
 
 void ConnectionManagerWindow::on_actionManual_triggered()
 {
-    QDesktopServices::openUrl(QString("https://eelke.gitlab.io/pgLab/#pglab-user-manual"));
+    OpenManual();
 }
 
 
diff --git a/pglab/DatabaseWindow.cpp b/pglab/DatabaseWindow.cpp
index 57908f6..c003c86 100644
--- a/pglab/DatabaseWindow.cpp
+++ b/pglab/DatabaseWindow.cpp
@@ -442,3 +442,9 @@ void DatabaseWindow::on_actionShow_connection_manager_triggered()
 {
     m_masterController->connectionController()->showConnectionManager();
 }
+
+void DatabaseWindow::on_actionManual_triggered()
+{
+    OpenManual();
+}
+
diff --git a/pglab/DatabaseWindow.h b/pglab/DatabaseWindow.h
index 9a8a8f6..ab259ae 100644
--- a/pglab/DatabaseWindow.h
+++ b/pglab/DatabaseWindow.h
@@ -106,6 +106,8 @@ private slots:
     void on_actionSave_copy_of_query_as_triggered();
     void on_actionShow_connection_manager_triggered();
 
+    void on_actionManual_triggered();
+
 public:
 	virtual void setTitleForWidget(QWidget *widget, QString title, QString hint) override;
 	virtual void setIconForWidget(QWidget *widget, QIcon icon) override;
diff --git a/pglab/DatabaseWindow.ui b/pglab/DatabaseWindow.ui
index c2e24d2..8000735 100644
--- a/pglab/DatabaseWindow.ui
+++ b/pglab/DatabaseWindow.ui
@@ -94,6 +94,7 @@
     <property name="title">
      <string>Help</string>
     </property>
+    <addaction name="actionManual"/>
     <addaction name="actionAbout"/>
    </widget>
    <addaction name="menuFile"/>
@@ -325,6 +326,11 @@
     <string>Show connection manager</string>
    </property>
   </action>
+  <action name="actionManual">
+   <property name="text">
+    <string>Manual</string>
+   </property>
+  </action>
  </widget>
  <resources>
   <include location="resources.qrc"/>
diff --git a/releasenotes/notes/about-7eeb6e282f8e2ef1.yaml b/releasenotes/notes/about-7eeb6e282f8e2ef1.yaml
index 33e7627..23ca431 100644
--- a/releasenotes/notes/about-7eeb6e282f8e2ef1.yaml
+++ b/releasenotes/notes/about-7eeb6e282f8e2ef1.yaml
@@ -1,6 +1,6 @@
 ---
 other:
-  - The connection window now has an About item in the file menu.
+  - The connection window now has an :menuselection:`Help --> About` menuitem.
   - The about dialog now uses html for enhanced formatting and hyperlinks.
   - |
     The about dialog now declares the usage of Icons8 icons and provides a
diff --git a/releasenotes/notes/help-usermanual-1ff757b8969fc8e9.yaml b/releasenotes/notes/help-usermanual-1ff757b8969fc8e9.yaml
new file mode 100644
index 0000000..cf86242
--- /dev/null
+++ b/releasenotes/notes/help-usermanual-1ff757b8969fc8e9.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The user manual can now be accessed from the menu :menuselection:`Help --> Manual`.
diff --git a/releasenotes/notes/reset-master-password-6a8f5ccf5a052344.yaml b/releasenotes/notes/reset-master-password-6a8f5ccf5a052344.yaml
index 08ca7f4..427738b 100644
--- a/releasenotes/notes/reset-master-password-6a8f5ccf5a052344.yaml
+++ b/releasenotes/notes/reset-master-password-6a8f5ccf5a052344.yaml
@@ -1,5 +1,6 @@
 ---
 features:
   - |
-    Added menu option to reset the password managers master password.
-    This will ofcourse also clear all saved passwords.
+    Added :menuselection:`File --> Reset password manager` menu option to reset
+    the password managers master password. This will ofcourse also clear all
+    saved passwords.