diff --git a/p11-kit-systemd-path.patch b/p11-kit-systemd-path.patch
deleted file mode 100644
index 14440f6..0000000
--- a/p11-kit-systemd-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 20a6109a27a7d97dde42140a75129e4f228ba895 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <dueno@redhat.com>
-Date: Fri, 24 Feb 2017 09:57:34 +0100
-Subject: [PATCH] systemd: Fix the location of p11-kit-remote
-
----
- p11-kit/p11-kit-remote@.service.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/p11-kit/p11-kit-remote@.service.in b/p11-kit/p11-kit-remote@.service.in
-index dd6d332..d42b180 100644
---- a/p11-kit/p11-kit-remote@.service.in
-+++ b/p11-kit/p11-kit-remote@.service.in
-@@ -7,4 +7,4 @@ Requires=p11-kit-remote.socket
- StandardInput=socket
- StandardOutput=socket
- StandardError=journal
--ExecStart=@libdir@/p11-kit/p11-kit-remote @libdir@/p11-kit-proxy.so
-+ExecStart=@libexecdir@/p11-kit/p11-kit-remote @libdir@/p11-kit-proxy.so
--- 
-2.9.3
-
diff --git a/p11-kit.spec b/p11-kit.spec
index fc38cd7..683b312 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -1,13 +1,12 @@
 Name:           p11-kit
-Version:        0.23.4
-Release:        3%{?dist}
+Version:        0.23.5
+Release:        1%{?dist}
 Summary:        Library for loading and sharing PKCS#11 modules
 
 License:        BSD
 URL:            http://p11-glue.freedesktop.org/p11-kit.html
 Source0:        https://github.com/p11-glue/p11-kit/releases/download/%{version}/p11-kit-%{version}.tar.gz
 Source1:        trust-extract-compat
-Patch0:		p11-kit-systemd-path.patch
 
 BuildRequires:  libtasn1-devel >= 2.3
 BuildRequires:  libffi-devel
@@ -41,13 +40,14 @@ The %{name}-trust package contains a system trust PKCS#11 module which
 contains certificate anchors and black lists.
 
 
-%package tools
-Summary:        Command line tools for %{name}
+%package server
+Summary:        Server and client commands for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description tools
-The %{name}-tools package contains command line tools that enable to export
-PKCS#11 modules through a Unix domain socket.
+%description server
+The %{name}-server package contains command line tools that enable to
+export PKCS#11 modules through a Unix domain socket.  Note that this
+feature is still experimental.
 
 
 # solution taken from icedtea-web.spec
@@ -61,7 +61,6 @@ PKCS#11 modules through a Unix domain socket.
 
 %prep
 %setup -q
-%patch0 -p1 -b .systemd-path
 
 %build
 # These paths are the source paths that  come from the plan here:
@@ -128,15 +127,16 @@ fi
 %{_datadir}/p11-kit/modules/p11-kit-trust.module
 %{_libexecdir}/p11-kit/trust-extract-compat
 
-%files tools
+%files server
 %{_libdir}/pkcs11/p11-kit-client.so
 %{_libexecdir}/p11-kit/p11-kit-server
-%{_userunitdir}/p11-kit-remote@.service
-%{_userunitdir}/p11-kit-remote.socket
-%{_userunitdir}/sockets.target.wants/p11-kit-remote.socket
 
 
 %changelog
+* Thu Mar  2 2017 Daiki Ueno <dueno@redhat.com> - 0.23.5-1
+- Update to 0.23.5 release
+- Rename -tools subpackage to -server and remove systemd unit files
+
 * Fri Feb 24 2017 Daiki Ueno <dueno@redhat.com> - 0.23.4-3
 - Move p11-kit command back to main package
 
diff --git a/sources b/sources
index 46712fe..0c0cf6b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (p11-kit-0.23.4.tar.gz) = d434c1078ffc565aaf1acb745b7eb5e158ccb863b7b807832c067e685809d3e4dbf06768d105d887a6db938a5b2a37f62ccc71b7228ead668e09663fe3bf6002
+SHA512 (p11-kit-0.23.5.tar.gz) = 5276db3c9bb14d5e0441e7b781033b1684edfc1d4da88a9c9ce501ed1f6121918d3afe6725ceb0e2d65fc253c2f9eebf37c3380741de6c1b09cec06ae86417a7