diff --git a/gnote-3.34.2.tar.xz b/gnote-3.34.2.tar.xz
deleted file mode 100644
index 51f9df5..0000000
--- a/gnote-3.34.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2166748be8202264560966d1801ca79ebfaa37e8010d48aebef7b52bc43d584a
-size 3491900
diff --git a/gnote-3.36.0.tar.xz b/gnote-3.36.0.tar.xz
new file mode 100644
index 0000000..ee58cbc
--- /dev/null
+++ b/gnote-3.36.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:29e503645d84abd94eb3ddadbfe7a63a82b30fd7f3ad01418cd4e4c58e07f336
+size 3495000
diff --git a/gnote-rpmlintrc b/gnote-rpmlintrc
new file mode 100644
index 0000000..b01f4f6
--- /dev/null
+++ b/gnote-rpmlintrc
@@ -0,0 +1,4 @@
+# Filter shared library policy missing suffix as we don't want to split the package at the moment:
+addFilter("gnote.* shlib-policy-missing-suffix")
+# Filter devel file in non devel package as splitting out a devel package is not needed, internal gnote use only.
+addFilter("gnote.* devel-file-in-non-devel-package")
diff --git a/gnote.changes b/gnote.changes
index 3a27b18..22c7bef 100644
--- a/gnote.changes
+++ b/gnote.changes
@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Sun Mar 15 13:22:45 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.36.0:
+  + Use UTC time in note directory watcher.
+  + Use UTC time in file system sync server.
+  + Fix crash on lock file update.
+  + Handle Glib exceptions in sync thread.
+  + Ditch file monitor from gnote sync client (causes random
+    crashes and does seem to be of any use.
+  + Use now if date time is invalid, use UTC time for sync.
+  + Bump required Glibmm version to 2.62.
+  + Updated translations.
+- Bump base_version define to 3.36 following upstream changes.
+- Add gnote-rpmlintrc as source, and filter out rpmlint warning
+  about shlib-policy-missing-suffix. We do not split out this on
+  purpose in this case, as the lib is only for gnote itself, and as
+  such the split makes no sense nor add value. Following this, also
+  add filter for devel-file-in-non-devel-package, using the same
+  reasoning.
+
+-------------------------------------------------------------------
+Sun Mar  8 20:51:30 UTC 2020 - mgorse@suse.com
+
+- Update to version 3.35.0:
+  + Required C++ standard is now C++14.
+  + Added 64-bit version D-Bus functions GetNoteCreateDateUnix and
+    GeNoteChangeDateUnix.
+  + Fix possible crash when removing tags.
+  + Updated translations.
+- Bump base_version define to 3.35 following upstream changes.
+
 -------------------------------------------------------------------
 Sun Mar  8 20:51:29 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>
 
diff --git a/gnote.spec b/gnote.spec
index d1fcbb1..1f34c22 100644
--- a/gnote.spec
+++ b/gnote.spec
@@ -16,16 +16,17 @@
 #
 
 
-%define base_version 3.34
+%define base_version 3.36
 
 Name:           gnote
-Version:        3.34.2
+Version:        3.36.0
 Release:        0
 Summary:        A Port of Tomboy to C++
 License:        GPL-3.0-or-later
 Group:          Productivity/Text/Editors
 URL:            https://wiki.gnome.org/Apps/Gnote
-Source0:        https://download.gnome.org/sources/gnote/3.34/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gnote/%{base_version}/%{name}-%{version}.tar.xz
+Source99:       gnote-rpmlintrc
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
@@ -35,7 +36,7 @@ BuildRequires:  libboost_test-devel >= 1.5.1
 BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
 BuildRequires:  yelp-tools
-BuildRequires:  pkgconfig(glibmm-2.4) >= 2.32
+BuildRequires:  pkgconfig(glibmm-2.4) >= 2.62
 BuildRequires:  pkgconfig(gspell-1) >= 1.6.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.20
 BuildRequires:  pkgconfig(gtkmm-3.0) >= 3.18