diff --git a/.etcd.metadata b/.etcd.metadata
index cbf0c6a..9928f1b 100644
--- a/.etcd.metadata
+++ b/.etcd.metadata
@@ -1 +1 @@
-0f79de1d4be76a4b4401afd0e3f6f3a5740f0d23 SOURCES/etcd-0f4a535.tar.gz
+9f5e39818f5e41b1c45065e45f531f36f69c0fc6 SOURCES/etcd-d0d1a87.tar.gz
diff --git a/.gitignore b/.gitignore
index 46d67ff..3818c68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/etcd-0f4a535.tar.gz
+SOURCES/etcd-d0d1a87.tar.gz
diff --git a/SOURCES/etcd.conf b/SOURCES/etcd.conf
index 0ea6a88..b4f4e2b 100644
--- a/SOURCES/etcd.conf
+++ b/SOURCES/etcd.conf
@@ -24,6 +24,7 @@ ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379"
 #ETCD_DISCOVERY_PROXY=""
 #ETCD_STRICT_RECONFIG_CHECK="false"
 #ETCD_AUTO_COMPACTION_RETENTION="0"
+#ETCD_ENABLE_V2="true"
 #
 #[proxy]
 #ETCD_PROXY="off"
@@ -53,3 +54,6 @@ ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379"
 #[profiling]
 #ETCD_ENABLE_PPROF="false"
 #ETCD_METRICS="basic"
+#
+#[auth]
+#ETCD_AUTH_TOKEN="simple"
diff --git a/SOURCES/expand-etcd-arch-validation.patch b/SOURCES/expand-etcd-arch-validation.patch
index f693a0f..d6c4fba 100644
--- a/SOURCES/expand-etcd-arch-validation.patch
+++ b/SOURCES/expand-etcd-arch-validation.patch
@@ -1,19 +1,30 @@
+From b3e78645c1ffa84bcde511c90df4e3dde652c3fa Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Tue, 8 Aug 2017 15:01:04 +0200
+Subject: [PATCH] expand etcd arch validation
+
+---
+ etcdmain/etcd.go | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
 diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
-index 58c74b5..ab0ab7f 100644
+index 2f7f00d..61553d4 100644
 --- a/etcdmain/etcd.go
 +++ b/etcdmain/etcd.go
-@@ -396,7 +396,12 @@ func setupLogging(cfg *config) {
- 
- func checkSupportArch() {
- 	// TODO qualify arm64
--	if runtime.GOARCH == "amd64" {
-+	if runtime.GOARCH == "amd64" || runtime.GOARCH == "ppc64le" {
-+		return
-+	}
+@@ -396,6 +396,13 @@ func checkSupportArch() {
+ 	if runtime.GOARCH == "amd64" || runtime.GOARCH == "ppc64le" {
+ 		return
+ 	}
++
 +	if runtime.GOARCH == "arm64" || runtime.GOARCH == "s390x" {
 +		plog.Warningf("Running etcd on %s architecture is experimental.", runtime.GOARCH)
 +		plog.Warningf("Please report any bugs you encounter: https://bugzilla.redhat.com/")
- 		return
- 	}
++		return
++	}
++
  	if env, ok := os.LookupEnv("ETCD_UNSUPPORTED_ARCH"); ok && env == runtime.GOARCH {
+ 		plog.Warningf("running etcd on unsupported architecture %q since ETCD_UNSUPPORTED_ARCH is set", env)
+ 		return
+-- 
+2.7.5
 
diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec
index be93335..c8fa50b 100644
--- a/SPECS/etcd.spec
+++ b/SPECS/etcd.spec
@@ -21,14 +21,14 @@
 # https://github.com/coreos/etcd
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
-%global commit          0f4a535c2fb7a2920e13e2e19b9eaf6b2e9285e5
+%global commit          d0d1a87aa96ae14914751d42264262cb69eda170
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 %global system_name     etcd
 
 Name:		etcd
-Version:	3.1.9
-Release:	2%{?dist}
+Version:	3.2.5
+Release:	1%{?dist}
 Summary:	A highly-available key value store for shared configuration
 License:	ASL 2.0
 URL:		https://%{provider_prefix}
@@ -435,6 +435,10 @@ getent passwd %{system_name} >/dev/null || useradd -r -g %{system_name} -d %{_sh
 %endif
 
 %changelog
+* Tue Aug 08 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.2.5-1
+- Update to 3.2.5
+  resolves: #1479371
+
 * Mon Jun 12 2017 Jan Chaloupka <jchaloup@redhat.com> - 3.1.9-2
 - Build for secondary architectures as well