diff --git a/.gitignore b/.gitignore
index 9f71ef2..83acda1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
 /gcr-3.28.1.tar.xz
 /gcr-3.33.4.tar.xz
 /gcr-3.34.0.tar.xz
+/gcr-3.35.1.tar.xz
diff --git a/gcr.spec b/gcr.spec
index 6e8ec4a..4fcb013 100644
--- a/gcr.spec
+++ b/gcr.spec
@@ -3,23 +3,24 @@
 %endif
 
 Name:           gcr
-Version:        3.34.0
+Version:        3.35.1
 Release:        1%{?dist}
 Summary:        A library for bits of crypto UI and parsing
 
 License:        LGPLv2+
 URL:            https://wiki.gnome.org/Projects/CryptoGlue
-Source0:        https://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/3.35/%{name}-%{version}.tar.xz
 
+BuildRequires:  gettext
+BuildRequires:  gtk-doc
+BuildRequires:  meson
 BuildRequires:  pkgconfig(gio-unix-2.0)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(p11-kit-1)
-BuildRequires:  chrpath
 BuildRequires:  docbook-style-xsl
 BuildRequires:  libgcrypt-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  intltool
 BuildRequires:  vala
 %if 0%{?has_valgrind}
 BuildRequires:  valgrind-devel
@@ -53,26 +54,15 @@ The gcr-base package includes the gcr-base library.
 %prep
 %autosetup -p1
 
-# Use system valgrind headers instead
-%if 0%{?has_valgrind}
-rm -rf build/valgrind/
-%endif
-
 %build
-%configure --enable-introspection
-%make_build
+%meson
+%meson_build
 
 
 %install
-%make_install
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libmock-test-module.*
+%meson_install
 %find_lang %{name}
 
-chrpath --delete $RPM_BUILD_ROOT%{_libdir}/lib*.so.*
-chrpath --delete $RPM_BUILD_ROOT%{_bindir}/gcr-viewer
-chrpath --delete $RPM_BUILD_ROOT%{_libexecdir}/gcr-prompter
-
 
 %check
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
@@ -89,7 +79,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 %{_datadir}/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert
 %{_datadir}/glib-2.0/schemas/org.gnome.crypto.pgp.gschema.xml
 %{_libdir}/girepository-1.0
-%{_libdir}/libgcr-3.so.*
 %{_libdir}/libgcr-ui-3.so.*
 %{_datadir}/icons/hicolor/*/apps/*
 %{_datadir}/mime/packages/gcr-crypto-types.xml
@@ -103,7 +92,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 %{_includedir}/gck-1
 %{_includedir}/gcr-3
 %{_libdir}/libgck-1.so
-%{_libdir}/libgcr-3.so
 %{_libdir}/libgcr-base-3.so
 %{_libdir}/libgcr-ui-3.so
 %{_libdir}/pkgconfig/gck-1.pc
@@ -114,7 +102,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 %dir %{_datadir}/gtk-doc
 %dir %{_datadir}/gtk-doc/html
 %{_datadir}/gtk-doc/html/gck
-%{_datadir}/gtk-doc/html/gcr-3
+%{_datadir}/gtk-doc/html/gcr
 %{_datadir}/vala/
 
 %files base
@@ -122,6 +110,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/gcr-viewer.desktop
 %{_libdir}/libgcr-base-3.so.*
 
 %changelog
+* Mon Jan 20 2020 Kalev Lember <klember@redhat.com> - 3.35.1-1
+- Update to 3.35.1
+- Switch to the meson build system
+
 * Mon Oct 14 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
 - Update to 3.34.0
 
diff --git a/sources b/sources
index 2d75703..8a50316 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gcr-3.34.0.tar.xz) = 9314b531ed46a42b2c8c1531c7d95003db04f2c8065e46f4e6a84ec26400ce6302ea71c4db42a8c7b98884a0b84d75a0ca65d988aa0fe6de6d897d772b070093
+SHA512 (gcr-3.35.1.tar.xz) = 1c00a0ae588ea0656ce4ebd41b010fd2c2f006048ce214193945981022db2db7dd5b78a175a43c792de0155e60fafb3d9239625d6353c9ac1b384de87c427219