diff --git a/gnote-initial-notes-creation.patch b/gnote-initial-notes-creation.patch
new file mode 100644
index 0000000..2197f96
--- /dev/null
+++ b/gnote-initial-notes-creation.patch
@@ -0,0 +1,29 @@
+From ea1da8fef7d78e4780059728fd352c6d2869a54c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Aurimas=20=C4=8Cernius?= <aurisc4@gmail.com>
+Date: Sun, 3 May 2020 12:54:53 +0300
+Subject: [PATCH] Fix start note creation and importing on first run
+
+Fixes https://gitlab.gnome.org/GNOME/gnote/-/issues/36
+---
+ src/notemanager.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/notemanager.cpp b/src/notemanager.cpp
+index 5c58ee25..ff7375ed 100644
+--- a/src/notemanager.cpp
++++ b/src/notemanager.cpp
+@@ -50,8 +50,9 @@ namespace gnote {
+   void NoteManager::init(const Glib::ustring & directory)
+   {
+     Glib::ustring backup = directory + "/Backup";
+-    NoteManagerBase::init(directory, backup);
++    // Before base init, after it will be false already
+     bool is_first_run = first_run();
++    NoteManagerBase::init(directory, backup);
+ 
+     Glib::RefPtr<Gio::Settings> settings = m_preferences.get_schema_settings(Preferences::SCHEMA_GNOTE);
+     // Watch the START_NOTE_URI setting and update it so that the
+-- 
+2.26.2
+
+
diff --git a/gnote.changes b/gnote.changes
index 22c7bef..37a34d9 100644
--- a/gnote.changes
+++ b/gnote.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May  5 19:30:23 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add gnote-initial-notes-creation.patch: Fix generation of initial
+  notes (e.g. Start here) on first run (boo1170588).
+
 -------------------------------------------------------------------
 Sun Mar 15 13:22:45 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnote.spec b/gnote.spec
index 1f34c22..53cd951 100644
--- a/gnote.spec
+++ b/gnote.spec
@@ -27,7 +27,8 @@ Group:          Productivity/Text/Editors
 URL:            https://wiki.gnome.org/Apps/Gnote
 Source0:        https://download.gnome.org/sources/gnote/%{base_version}/%{name}-%{version}.tar.xz
 Source99:       gnote-rpmlintrc
-
+# PATCH-FIX-UPSTREAM gnote-initial-notes-creation.patch boo#1170588 dimstar@opensuse.org -- Fix generation of sample notes on first start
+Patch0:         gnote-initial-notes-creation.patch
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++