diff --git a/srcpkgs/etcd/files/etcd/conf b/srcpkgs/etcd/files/etcd/conf
new file mode 100644
index 00000000000..023129b0e07
--- /dev/null
+++ b/srcpkgs/etcd/files/etcd/conf
@@ -0,0 +1,249 @@
+# Human_readable name for this member.
+#
+# default: "default"
+#
+# ETCD_NAME="default"
+
+# Path to the data directory.
+#
+# default: "${name}.etcd"
+# distribution default: "/var/lib/etcd"
+#
+# ETCD_DATA_DIR="/var/lib/etcd"
+
+# Path to the dedicated wal directory.
+# If this flag is set, etcd will write the WAL files
+# to the walDir rather than the dataDir.
+#
+# default: ""
+#
+# ETCD_WAL_DIR=""
+
+# Number of committed transactions to trigger a snapshot to disk.
+#
+# default: 10000
+#
+# ETCD_SNAPSHOT_COUNT=10000
+
+# Time (in milliseconds) of a heartbeat interval.
+#
+# default: 100
+#
+# ETCD_HEARTBEAT_INTERVAL=100
+
+# Time (in milliseconds) for an election to timeout.
+#
+# default: 1000
+#
+# ETCD_ELECTION_TIMEOUT=1000
+
+# List of URLs to listen on for peer traffic.
+#
+# default: "http://localhost:2380,http://localhost:7001"
+#
+# ETCD_LISTEN_PEER_URLS="http://localhost:2380,http://localhost:7001"
+
+# List of URLs to listen on for client traffic.
+#
+# default: "http://localhost:2379,http://localhost:4001"
+#
+# ETCD_LISTEN_CLIENT_URLS="http://localhost:2379,http://localhost:4001"
+
+# Maximum number of snapshot files to retain (0 is unlimited)
+#
+# default: 5
+#
+# ETCD_MAX_SNAPSHOTS=5
+
+# Maximum number of wal files to retain (0 is unlimited)
+#
+# default: 5
+#
+# ETCD_MAX_WALS=5
+
+# Comma_separated white list of origins for CORS (cross_origin resource sharing).
+#
+# default: none
+#
+# ETCD_CORS=
+
+# List of this member's peer URLs to advertise to the rest of the cluster.
+# These addresses are used for communicating etcd data around the cluster.
+# At least one must be routable to all cluster members.
+#
+# default: "http://localhost:2380,http://localhost:7001"
+#
+# ETCD_INITIAL_ADVERTISE_PEER_URLS="http://localhost:2380,http://localhost:7001"
+
+# Initial cluster configuration for bootstrapping.
+#
+# default: "default=http://localhost:2380,default=http://localhost:7001"
+# distribution default: "default=http://localhost:2380,default=http://localhost:7001"
+#
+# ETCD_INITIAL_CLUSTER="default=http://localhost:2380,default=http://localhost:7001"
+
+# Initial cluster state ("new" or "existing").
+# Set to new for all members present during initial static or DNS bootstrapping.
+# If this option is set to existing, etcd will attempt to join the existing cluster.
+# If the wrong value is set, etcd will attempt to start but fail safely.
+#
+# default: "new"
+#
+# ETCD_INITIAL_CLUSTER_STATE="new"
+
+# Initial cluster token for the etcd cluster during bootstrap.
+#
+# default: "etcd_cluster"
+#
+# ETCD_INITIAL_CLUSTER_TOKEN="etcd_cluster"
+
+# List of this member's client URLs to advertise to the rest of the cluster.
+#
+# default: "http://localhost:2379,http://localhost:4001"
+#
+# ETCD_ADVERTISE_CLIENT_URLS="http://localhost:2379,http://localhost:4001"
+
+# Discovery URL used to bootstrap the cluster.
+#
+# default: none
+#
+# ETCD_DISCOVERY=
+
+# DNS srv domain used to bootstrap the cluster.
+#
+# default: none
+#
+# ETCD_DISCOVERY_SRV=
+
+# Expected behavior ("exit" or "proxy") when discovery services fails.
+#
+# default: "proxy"
+#
+# ETCD_DISCOVERY_FALLBACK="proxy"
+
+# HTTP proxy to use for traffic to discovery service.
+#
+# default: none
+#
+# ETCD_DISCOVERY_PROXY=
+
+# Proxy mode setting ("off", "readonly" or "on").
+#
+# default: "off"
+#
+# ETCD_PROXY="off"
+
+# Time (in milliseconds) an endpoint will be held
+# in a failed state before being reconsidered for proxied requests.
+#
+# default: 5000
+#
+# ETCD_PROXY_FAILURE_WAIT=5000
+
+# Time (in milliseconds) of the endpoints refresh interval.
+#
+# default: 30000
+#
+# ETCD_PROXY_REFRESH_INTERVAL=30000
+
+# Time (in milliseconds) for a dial to timeout or 0 to disable the timeout.
+#
+# default: 1000
+#
+# ETCD_PROXY_DIAL_TIMEOUT=1000
+
+# Time (in milliseconds) for a write to timeout or 0 to disable the timeout.
+#
+# default: 5000
+#
+# ETCD_PROXY_WRITE_TIMEOUT=5000
+
+# Time (in milliseconds) for a read to timeout or 0 to disable the timeout.
+# Don't change this value if you use watches because they are using long polling requests.
+#
+# default: 0
+#
+# ETCD_PROXY_READ_TIMEOUT=0
+
+# Path to the client server TLS CA file.
+#
+# default: none
+#
+# ETCD_CA_FILE=
+
+# Path to the client server TLS cert file.
+#
+# default: none
+#
+# ETCD_CERT_FILE=
+
+# Path to the client server TLS key file.
+#
+# default: none
+#
+# ETCD_KEY_FILE=
+
+# Enable client cert authentication.
+#
+# default: false
+#
+# ETCD_CLIENT_CERT_AUTH=false
+
+# Path to the client server TLS trusted CA key file.
+#
+# default: none
+#
+# ETCD_TRUSTED_CA_FILE=
+
+# [DEPRECATED] Path to the peer server TLS CA file.
+#
+# default: none
+#
+# ETCD_PEER_CA_FILE=
+
+# Path to the peer server TLS cert file.
+#
+# default: none
+#
+# ETCD_PEER_CERT_FILE=
+
+# Path to the peer server TLS key file.
+#
+# default: none
+#
+# ETCD_PEER_KEY_FILE=
+
+# Enable peer client cert authentication.
+#
+# default: false
+#
+# ETCD_PEER_CLIENT_CERT_AUTH=false
+
+# Path to the peer server TLS trusted CA file.
+#
+# default: none
+#
+# ETCD_PEER_TRUSTED_CA_FILE=
+
+# Drop the default log level to DEBUG for all subpackages.
+#
+# default: false (INFO for all packages)
+#
+# ETCD_DEBUG=false
+
+# Set individual etcd subpackages to specific log levels.
+# An example being etcdserver=WARNING,security=DEBUG
+#
+# default: none (INFO for all packages)
+#
+# ETCD_LOG_PACKAGE_LEVELS=
+
+# Force to create a new one_member cluster.
+# It commits configuration changes in force to remove all existing members in the cluster and add itself.
+# It needs to be set to restore a backup.
+#
+# default: false
+#
+# ETCD_FORCE_NEW_CLUSTER=false
+
+# vim:ft=sh:
diff --git a/srcpkgs/etcd/files/etcd/run b/srcpkgs/etcd/files/etcd/run
new file mode 100644
index 00000000000..4d3f3656299
--- /dev/null
+++ b/srcpkgs/etcd/files/etcd/run
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+export ETCD_DATA_DIR=/var/lib/etcd
+export ETCD_NAME=etcd
+
+[ -r conf ] && . ./conf
+exec chpst -u etcd:etcd etcd
diff --git a/srcpkgs/etcd/template b/srcpkgs/etcd/template
new file mode 100644
index 00000000000..908bb907668
--- /dev/null
+++ b/srcpkgs/etcd/template
@@ -0,0 +1,24 @@
+# Template file for 'etcd'
+pkgname=etcd
+version=2.2.5
+revision=1
+build_style=go
+short_desc="Distributed reliable key-value store"
+maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
+license="Apache-2.0"
+go_import_path="github.com/coreos/etcd"
+homepage="https://coreos.com/etcd/docs/latest/"
+distfiles="https://${go_import_path}/archive/v${version}.tar.gz"
+checksum=a7fb7998ada620fda74e517c100891d25a15a6fa20b627df52da7cd29328e6d5
+conf_files="/etc/sv/etcd/conf"
+system_accounts="etcd"
+make_dirs="/var/lib/etcd 0755 etcd etcd"
+
+post_build() {
+	go get -x ${go_import_path}/etcdctl
+}
+
+post_install() {
+	vlicense LICENSE
+	vsv etcd
+}