diff --git a/_service b/_service
index ddec4c2..4e87190 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
     <param name="url">git://github.com/etcd-io/etcd.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="revision">v3.4.15</param>
+    <param name="revision">v3.4.16</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="changesgenerate">enable</param>
     <param name="versionrewrite-pattern">v(.*)</param>
diff --git a/_servicedata b/_servicedata
index e7f907a..14311fb 100644
--- a/_servicedata
+++ b/_servicedata
@@ -3,4 +3,4 @@
                 <param name="url">https://github.com/coreos/etcd.git</param>
               <param name="changesrevision">94745a4eed0425653b3b4275a208d38babceeaec</param></service><service name="tar_scm">
                 <param name="url">git://github.com/etcd-io/etcd.git</param>
-              <param name="changesrevision">aa7126864d82e88c477594b8a53f55f2e2408aa3</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">d19fbe541bf9c81e2d69d71d1068bd40c04de200</param></service></servicedata>
\ No newline at end of file
diff --git a/etcd-3.4.15.tar.gz b/etcd-3.4.15.tar.gz
deleted file mode 100644
index 8ed0a53..0000000
--- a/etcd-3.4.15.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42600eef473dded7e1b38ed843c2a537d62fd30ffa2cd566e1d08a6ec6621ad0
-size 9289197
diff --git a/etcd-3.4.16.tar.gz b/etcd-3.4.16.tar.gz
new file mode 100644
index 0000000..37af4e3
--- /dev/null
+++ b/etcd-3.4.16.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:febaa801cbb80e10a79044250827e7810c417235da25674cb205293ddb0f452a
+size 8935573
diff --git a/etcd.changes b/etcd.changes
index 3e21ae5..592215a 100644
--- a/etcd.changes
+++ b/etcd.changes
@@ -1,3 +1,34 @@
+-------------------------------------------------------------------
+Thu May 13 13:42:05 UTC 2021 - alexandre.vicenzi@suse.com
+
+- Update to version 3.4.16:
+  * version: 3.4.16
+  * Backport-3.4 exclude alarms from health check conditionally
+  * etcdserver/mvcc: update trace.Step condition
+  * Backport-3.4 etcdserver/util.go: reduce memory when logging range requests
+  * .travis,Makefile,functional: Bump go 1.12 version to v1.12.17
+  * integration: Fix 'go test --tags cluster_proxy --timeout=30m -v ./integration/...'
+  * pkg/tlsutil: Adjust cipher suites for go 1.12
+  * Fix pkg/tlsutil (test) to not fail on 386.
+  * bill-of-materials.json: Update golang.org/x/sys
+  * .travis,test: Turn race off in Travis for go version 1.15
+  * integration : fix TestTLSClientCipherSuitesMismatch in go1.13
+  * vendor: Run go mod vendor
+  * go.mod,go.sum: Bump github.com/creack/pty that includes patch
+  * go.mod,go.sum: Comply with go v1.15
+  * etcdserver,wal: Convert int to string using rune()
+  * integration,raft,tests: Comply with go v1.15 gofmt
+  * .travis.yml: Test with go v1.15.11
+  * pkpkg/testutil/leak.go: Allowlist created by testing.runTests.func1
+  * vendor: Run go mod vendor
+  * go.sum, go.mod: Run go mod tidy with go 1.12
+  * go.mod: Pin go to 1.12 version
+  * etcdserver: fix incorrect metrics generated when clients cancel watches
+  * integration: relax leader timeout from 3s to 4s
+  * etcdserver: when using --unsafe-no-fsync write data
+  * server: Added config parameter experimental-warning-apply-duration
+  * etcdserver: Fix PeerURL validation
+
 -------------------------------------------------------------------
 Fri Apr 16 20:34:06 UTC 2021 - Dirk Müller <dmueller@suse.com>
 
diff --git a/etcd.spec b/etcd.spec
index bbf0940..fdc8477 100644
--- a/etcd.spec
+++ b/etcd.spec
@@ -22,7 +22,7 @@
   %define _fillupdir %{_localstatedir}/adm/fillup-templates
 %endif
 Name:           etcd
-Version:        3.4.15
+Version:        3.4.16
 Release:        0
 Summary:        Highly-available key value store for configuration and service discovery
 License:        Apache-2.0
@@ -67,26 +67,19 @@ to explore an etcd cluster.
 cp %{SOURCE15} .
 
 %build
-%{goprep} go.etcd.io/etcd
-export GOPATH=$HOME/go
-mkdir -pv $HOME/go/src/%{project}
-rm -rf $HOME/go/src/%{project}/*
-cp -avr * $HOME/go/src/%{project}
+%{goprep} %{project}
 
-cd $HOME/go/src/%{project}
-go build -v -buildmode=pie -o etcd
+mkdir -p ./bin
 
-cd $HOME/go/src/%{project}/etcdctl
-go build -v -buildmode=pie -o etcdctl
+go build -v -buildmode=pie -mod=vendor -o ./bin/etcd
+go build -v -buildmode=pie -mod=vendor -o ./bin/etcdctl ./etcdctl
 
 %install
-cd $HOME/go/src/%{project}
-
 install -d %{buildroot}/%{_sbindir}
-install -D -m 0755 etcd %{buildroot}/%{_sbindir}/etcd
+install -D -m 0755 ./bin/etcd %{buildroot}/%{_sbindir}/etcd
 
 install -d %{buildroot}/%{_bindir}
-install -D -m 0755 etcdctl/etcdctl %{buildroot}/%{_bindir}/etcdctl
+install -D -m 0755 ./bin/etcdctl %{buildroot}/%{_bindir}/etcdctl
 
 # Service
 install -D -p -m 0644 %{SOURCE12} %{buildroot}%{_unitdir}/%{name}.service
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 5d1e2aa..5442148 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1dd4ab975647c54349a205ff59f70ea3c82acf8aeb263ef32a394af58f6bb6af
-size 3326889
+oid sha256:cabd64a16316a618b65396c46f7d3488c9caea30b3ac4ff39afe0117880c4e3e
+size 2990865