diff --git a/.etcd.metadata b/.etcd.metadata
index ab8bac2..102e67a 100644
--- a/.etcd.metadata
+++ b/.etcd.metadata
@@ -1,2 +1,2 @@
-81655318845d15a9988e733eefff21294501d8e6 SOURCES/etcd-eddf599.tar.gz
-c23294ec072c39f5d9a891e2c16c930e126df34d SOURCES/man-3.2.18.tar.gz
+580053e2fa7e28926bf1b84e9e2e5ea94c240341 SOURCES/etcd-1674e68.tar.gz
+0b21a0f31a459aa0bbe1edf1215b7ca2cb0ed385 SOURCES/man-3.2.22.tar.gz
diff --git a/.gitignore b/.gitignore
index 9af6e9c..5fcef1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/etcd-eddf599.tar.gz
-SOURCES/man-3.2.18.tar.gz
+SOURCES/etcd-1674e68.tar.gz
+SOURCES/man-3.2.22.tar.gz
diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec
index e852c73..fde07c0 100644
--- a/SPECS/etcd.spec
+++ b/SPECS/etcd.spec
@@ -17,13 +17,14 @@
 # https://github.com/coreos/etcd
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          eddf599c689ec85f4752060edff5a72e81e9106a
+%global commit          1674e682fe9fbecd66e9f20b77da852ad7f517a9
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global system_name     etcd
+%global man_version     3.2.22
 
 Name:		etcd
-Version:	3.2.18
+Version:	3.2.22
 Release:	1%{?dist}
 Summary:	A highly-available key value store for shared configuration
 License:	ASL 2.0
@@ -31,7 +32,7 @@ URL:		https://%{provider_prefix}
 Source0:	https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
 Source1:	%{system_name}.service
 Source2:	%{system_name}.conf
-Source3:        man-%{version}.tar.gz
+Source3:        man-%{man_version}.tar.gz
 Patch3:         bz1350875-disaster-recovery-with-copies.patch
 Patch4:         expand-etcd-arch-validation.patch
 
@@ -56,10 +57,10 @@ Requires(postun): systemd
 A highly-available key value store for shared configuration.
 
 %prep
-%setup -q -n man-%{version} -T -b 3
+%setup -q -n man-%{man_version} -T -b 3
 %setup -q -n %{repo}-%{commit}
 mkdir -p man/man1
-cp ../man-%{version}/*.1 man/man1/.
+cp ../man-%{man_version}/*.1 man/man1/.
 
 # move content of vendor under Godeps as has been so far
 mkdir -p Godeps/_workspace/src
@@ -122,6 +123,14 @@ getent passwd %{system_name} >/dev/null || useradd -r -g %{system_name} -d %{_sh
 %{_mandir}/man1/*.1*
 
 %changelog
+* Mon Jun 11 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.22-1
+- Update to 3.2.22
+  resolves: #1541355
+
+* Mon Jun 04 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.21-1
+- Update to 3.2.21
+  resolves: #1585787
+
 * Tue Apr 17 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.18-1
 - Update to 3.2.18
   resolves: #1568389