diff --git a/.gitignore b/.gitignore
index e5f33f8..7c97261 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/man-3.2.7.tar.gz
-/etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz
+/etcd-3.2.16.tar.gz
+/man-3.2.16.tar.gz
diff --git a/Fix-format-errors.patch b/Fix-format-errors.patch
new file mode 100644
index 0000000..5907294
--- /dev/null
+++ b/Fix-format-errors.patch
@@ -0,0 +1,34 @@
+From 89901423d929b66240231196616688cddb39b115 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup@redhat.com>
+Date: Fri, 9 Mar 2018 17:13:26 +0100
+Subject: [PATCH] Fix format errors
+
+---
+ pkg/pbutil/pbutil_test.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pkg/pbutil/pbutil_test.go b/pkg/pbutil/pbutil_test.go
+index fd361ec..21b1870 100644
+--- a/pkg/pbutil/pbutil_test.go
++++ b/pkg/pbutil/pbutil_test.go
+@@ -24,7 +24,7 @@ func TestMarshaler(t *testing.T) {
+ 	data := []byte("test data")
+ 	m := &fakeMarshaler{data: data}
+ 	if g := MustMarshal(m); !reflect.DeepEqual(g, data) {
+-		t.Errorf("data = %s, want %s", g, m)
++		t.Errorf("data = %s, want #%v", g, m)
+ 	}
+ }
+ 
+@@ -43,7 +43,7 @@ func TestUnmarshaler(t *testing.T) {
+ 	m := &fakeUnmarshaler{}
+ 	MustUnmarshal(m, data)
+ 	if !reflect.DeepEqual(m.data, data) {
+-		t.Errorf("data = %s, want %s", m.data, m)
++		t.Errorf("data = %s, want #%v", m.data, m)
+ 	}
+ }
+ 
+-- 
+2.7.5
+
diff --git a/etcd.spec b/etcd.spec
index ce3c1cb..21fbae6 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -1,14 +1,14 @@
 # http://github.com/coreos/etcd
 %global goipath         github.com/coreos/etcd
-%global commit          bb66589f8cf18960c7f3d56b1b83753caeed9c7a
+%global gcommit         121edf0467052d55876a817b89875fb39a99bf78
 
 %gometa -i
 
-%global man_version     3.2.7
+%global man_version     3.2.16
 
 Name:           etcd
-Version:	3.2.7
-Release:	5%{?dist}
+Version:	3.2.16
+Release:	1%{?dist}
 Summary:	A highly-available key value store for shared configuration
 License:	ASL 2.0
 URL:            %{gourl}
@@ -17,6 +17,8 @@ Source1:	%{name}.service
 Source2:	%{name}.conf
 Source3:        man-%{man_version}.tar.gz
 
+Patch0:         Fix-format-errors.patch
+
 BuildRequires: golang(github.com/bgentry/speakeasy)
 BuildRequires: golang(github.com/boltdb/bolt)
 BuildRequires: golang(github.com/cheggaaa/pb)
@@ -68,23 +70,24 @@ Summary:        etcd golang devel libraries
 BuildArch:      noarch
 
 BuildRequires: golang(github.com/bgentry/speakeasy)
-BuildRequires: golang(github.com/boltdb/bolt)
 BuildRequires: golang(github.com/cheggaaa/pb)
 BuildRequires: golang(github.com/cockroachdb/cmux)
+BuildRequires: golang(github.com/coreos/bbolt)
 BuildRequires: golang(github.com/coreos/go-semver/semver)
 BuildRequires: golang(github.com/coreos/go-systemd/daemon)
 BuildRequires: golang(github.com/coreos/go-systemd/util)
 BuildRequires: golang(github.com/coreos/pkg/capnslog)
+BuildRequires: golang(github.com/dgrijalva/jwt-go)
 BuildRequires: golang(github.com/dustin/go-humanize)
 BuildRequires: golang(github.com/ghodss/yaml)
 BuildRequires: golang(github.com/gogo/protobuf/proto)
+BuildRequires: golang(github.com/golang/groupcache/lru)
 BuildRequires: golang(github.com/golang/protobuf/proto)
 BuildRequires: golang(github.com/google/btree)
 BuildRequires: golang(github.com/grpc-ecosystem/go-grpc-prometheus)
 BuildRequires: golang(github.com/grpc-ecosystem/grpc-gateway/runtime)
 BuildRequires: golang(github.com/grpc-ecosystem/grpc-gateway/utilities)
 BuildRequires: golang(github.com/jonboulle/clockwork)
-BuildRequires: golang(github.com/karlseguin/ccache)
 BuildRequires: golang(github.com/kr/pty)
 BuildRequires: golang(github.com/olekukonko/tablewriter)
 BuildRequires: golang(github.com/prometheus/client_golang/prometheus)
@@ -96,13 +99,19 @@ BuildRequires: golang(github.com/xiang90/probing)
 BuildRequires: golang(golang.org/x/crypto/bcrypt)
 BuildRequires: golang(golang.org/x/net/context)
 BuildRequires: golang(golang.org/x/net/http2)
+BuildRequires: golang(golang.org/x/net/trace)
 BuildRequires: golang(golang.org/x/time/rate)
+BuildRequires: golang(google.golang.org/genproto/googleapis/api/annotations)
 BuildRequires: golang(google.golang.org/grpc)
 BuildRequires: golang(google.golang.org/grpc/codes)
 BuildRequires: golang(google.golang.org/grpc/credentials)
 BuildRequires: golang(google.golang.org/grpc/grpclog)
+BuildRequires: golang(google.golang.org/grpc/health/grpc_health_v1)
+BuildRequires: golang(google.golang.org/grpc/keepalive)
 BuildRequires: golang(google.golang.org/grpc/metadata)
 BuildRequires: golang(google.golang.org/grpc/naming)
+BuildRequires: golang(google.golang.org/grpc/peer)
+BuildRequires: golang(google.golang.org/grpc/status)
 
 %description devel
 golang development libraries for etcd, a highly-available key value store for
@@ -110,7 +119,8 @@ shared configuration.
 
 %prep
 %setup -q -n man-%{man_version} -T -b 3
-%gosetup
+%gosetup -q
+%patch0 -p1
 
 mkdir -p man/man1
 cp ../man-%{man_version}/*.1 man/man1/.
@@ -143,7 +153,7 @@ install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name}
 
 %check
 # tools/functional-tester/etcd-agent expects etcd binary at GOPATH/bin/etcd
-%gochecks -d clientv3 -d e2e -d tools/functional-tester/etcd-agent
+%gochecks -d clientv3 -d e2e -d tools/functional-tester/etcd-agent -d integration -d clientv3/integration
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
@@ -164,6 +174,9 @@ install -d -m 0755 %{buildroot}%{_sharedstatedir}/%{name}
 %doc glide.lock
 
 %changelog
+* Fri Mar 09 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.16-1.git121edf0
+- Update to 3.2.16
+
 * Tue Mar 06 2018 Jan Chaloupka <jchaloup@redhat.com> - 3.2.7-5.gitbb66589
 - Update to spec 3.0
 
diff --git a/etcdctl.1 b/etcdctl.1
new file mode 100644
index 0000000..bec2361
--- /dev/null
+++ b/etcdctl.1
@@ -0,0 +1,25 @@
+.TH "ETCD" "1" " etcd User Manuals" "Jan Chaloupka" "Oct 2017"  ""
+
+
+.SH NAME
+.PP
+etcdctl \- A simple command line client for etcd
+
+
+.SH SYNOPSIS
+.PP
+\fB[ETCDCTL_API=3] etctctl\fP [OPTIONS]
+
+
+.SH DESCRIPTION
+.PP
+Command line client for etcd.
+Queries to v2 data model are available through \fBetcdtl\fP command (see \fBetcdctl2(1)\fP).
+Queries to v3 data model are available through \fBETCDCTL=3 etcdtl\fP command (see \fBetcdctl3(1)\fP).
+
+.PP
+Find more information at 
+\[la]https://github.com/coreos/etcd\[ra].
+
+.SH SEE ALSO
+\fBetcd(1)\fP, \fBetcdctl2(1)\fP, \fBetcdctl3(1)\fP
diff --git a/genmanpages.sh b/genmanpages.sh
new file mode 100755
index 0000000..fedb2a4
--- /dev/null
+++ b/genmanpages.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+rm -rf man
+mkdir -p man/etcdctl2 man/etcdctl3
+pushd man/etcdctl3
+ETCDCTL_API=3 ../../$1/bin/etcdctl --help
+
+# rename to etcdctl3...
+for line in $(ls *.1); do mv $line $(echo $line | sed "s/etcdctl/etcdctl3/"); done
+
+# rename refs
+sed -i "s/\\\fBetcdctl\\\-/\\\fBetcdctl3\\\-/g" *.1
+
+# stress ETCDCTL_API use
+sed -i s"/^\\\fBetcdctl /\\\fBETCDCTL=3 etcdctl /" etcdctl3*.1
+
+cd ../etcdctl2
+../../$1/bin/etcdctl --help > etcdctl.1
+
+for cmd in $(cat etcdctl.1 | grep "\fBetcdctl" | cut -d'-' -f2-3 | cut -d'(' -f1); do ../../$1/bin/etcdctl $cmd --help > etcdctl-$cmd.1; done
+
+# rename to etcdctl2
+for line in $(ls *.1); do mv $line $(echo $line | sed "s/etcdctl/etcdctl2/"); done
+
+# rename refs
+sed -i "s/\\\fBetcdctl-/\\\fBetcdctl2-/g" *.1
+
+cd ..
+mv etcdctl2/* .
+mv etcdctl3/* .
+rm -rf etcdctl2 etcdctl3
+cp ../etcdctl.1 .
+
+# Gen etcd.1
+../$1/bin/etcd --help > etcd.1
diff --git a/sources b/sources
index c9481d9..0bd1a5b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (man-3.2.7.tar.gz) = f29007c14163adb2c3fa157b21471793498f96ebcc6fd536a6aabbb5564412a544eae3aff4415782b90e08fcd2cb737e31c90960d4b179037c882fe194be53ee
-SHA512 (etcd-bb66589f8cf18960c7f3d56b1b83753caeed9c7a.tar.gz) = 88a00ff578826bc7e06c6b88ca4ade468588e72ad4e33bdd8193dd942f1695cca285213ab40ce357f28f534a9d4ca50579f3d29183b468061500262e0441ce21
+SHA512 (etcd-3.2.16.tar.gz) = 5f3322b30266b0486310243d8f0c549d718687413e82fff27b26f195619a8e70ab5018921e02495f088ebe285559da76dcbfb9da0ef1f1d3c046ff90b8e4904c
+SHA512 (man-3.2.16.tar.gz) = 3bb97ea010fed98ea9297b2c4e9222559bff380e77df928c4a145757c9ce09c02ad06403d8e4a68e9f9a391ff3eb81deb77302668a8fb809b8f62ecf0c7bc283