diff --git a/gcr-3.40.0.tar.xz b/gcr-3.40.0.tar.xz
deleted file mode 100644
index b48b194..0000000
--- a/gcr-3.40.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b9d3645a5fd953a54285cc64d4fc046736463dbd4dcc25caf5c7b59bed3027f5
-size 1011044
diff --git a/gcr-3.41.0.tar.xz b/gcr-3.41.0.tar.xz
new file mode 100644
index 0000000..83484b8
--- /dev/null
+++ b/gcr-3.41.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0909fc49ea8ad4832d27564ff2fd1dc666696e2a07c73941c48829e60572da01
+size 1039744
diff --git a/gcr.changes b/gcr.changes
index 2d38516..23d6353 100644
--- a/gcr.changes
+++ b/gcr.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Oct  5 08:18:33 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 3.41.0:
+  +  Port ssh-agent from gnome-keyring.
+  + build: Fix parallel build failure due to missing marshal
+    dependency.
+  + Fix warnings by dropping `volatile` for g_once_init_inter
+    locations.
+  + tests: More robust against GTask unref race condition.
+  + Updated translations.
+- Add pkgconfig(libsecret-1), pkgconfig(libsystemd),
+  pkgconfig(systemd) and openssh-clients BuildRequires: Build new
+  standalone ssh-agent, and split it out in own sub-package.
+
 -------------------------------------------------------------------
 Sat Apr 17 12:46:53 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
 
diff --git a/gcr.spec b/gcr.spec
index becb52f..3b3bd46 100644
--- a/gcr.spec
+++ b/gcr.spec
@@ -17,14 +17,14 @@
 
 
 Name:           gcr
-Version:        3.40.0
+Version:        3.41.0
 Release:        0
 # FIXME: Verify if the requires in typelib-1_0-Gcr-3 is still correct and required (see bgo#725501).
 Summary:        Library for Crypto UI related tasks
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/GNOME
 URL:            http://www.gnome.org
-Source0:        https://download.gnome.org/sources/gcr/3.40/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gcr/3.41/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
 # PATCH-FIX-SLE gcr-bsc932232-use-libgcrypt-allocators.patch bsc#932232 hpj@suse.com -- use libgcrypt allocators for FIPS mode
 Patch1:         gcr-bsc932232-use-libgcrypt-allocators.patch
@@ -36,6 +36,7 @@ BuildRequires:  gobject-introspection-devel >= 1.34
 BuildRequires:  gtk-doc
 BuildRequires:  libgcrypt-devel >= 1.4.5
 BuildRequires:  meson
+BuildRequires:  openssh-clients
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.18.0.22
@@ -48,8 +49,11 @@ BuildRequires:  pkgconfig(gmodule-no-export-2.0)
 BuildRequires:  pkgconfig(gobject-2.0)
 BuildRequires:  pkgconfig(gthread-2.0)
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.22
+BuildRequires:  pkgconfig(libsecret-1)
+BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(p11-kit-1) >= 0.19.0
 BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(systemd)
 
 %description
 GCR is a library for displaying certificates, and crypto UI, accessing
@@ -84,17 +88,27 @@ This package provides the prompt dialog needed by libgcr.
 %package ssh-askpass
 Summary:        SSH password callback helper for gcr
 Group:          System/Libraries
-Supplements:    packageand(gpg2:gnome-shell)
+Supplements:    (gpg2 and gnome-shell)
 
 %description ssh-askpass
 gcr-ssh-askpass allows an ssh command to callback for a password.
 
+%package ssh-agent
+Summary:        SSH agent binary for gcr
+Group:          System/Libraries
+Supplements:    (gpg2 and gnome-shell)
+
+%description ssh-agent
+gcr-ssh-agent as a standalone binary, so that it can easily be
+managed through systemd.
+
 %package -n libgcr-3-1
 Summary:        Library for Crypto UI related tasks
 Group:          System/Libraries
 Requires:       %{name}-data >= %{version}
 Requires:       %{name}-prompter >= %{version}
 Recommends:     %{name}-ask-pass
+Recommends:     %{name}-ssh-agent
 Recommends:     %{name}-viewer = %{version}
 # To make lang package installable
 Provides:       %{name} = %{version}
@@ -192,6 +206,15 @@ GCK is a library for accessing PKCS#11 modules like smart cards, in a
 %post -n libgck-1-0 -p /sbin/ldconfig
 %postun -n libgck-1-0 -p /sbin/ldconfig
 
+%post -n %{name}-ssh-agent
+%systemd_user_post gcr-ssh-agent.service
+
+%preun -n %{name}-ssh-agent
+%systemd_user_preun gcr-ssh-agent.service
+
+%postun -n %{name}-ssh-agent
+%systemd_user_postun_with_restart gcr-ssh-agent.service
+
 %files viewer
 %license COPYING
 %doc NEWS
@@ -218,6 +241,11 @@ GCK is a library for accessing PKCS#11 modules like smart cards, in a
 %files ssh-askpass
 %{_libexecdir}/gcr-ssh-askpass
 
+%files ssh-agent
+%{_libexecdir}/gcr-ssh-agent
+%{_userunitdir}/gcr-ssh-agent.service
+%{_userunitdir}/gcr-ssh-agent.socket
+
 %files -n libgcr-3-1
 %license COPYING
 %doc NEWS