diff --git a/.etcd.metadata b/.etcd.metadata
new file mode 100644
index 0000000..c8121da
--- /dev/null
+++ b/.etcd.metadata
@@ -0,0 +1 @@
+80b405fd01527eea6668fde0186ca6b119c1185c SOURCES/etcd-0.4.6.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..38921e2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+SOURCES/etcd-0.4.6.tar.gz
diff --git a/README.md b/README.md
deleted file mode 100644
index 98f42b4..0000000
--- a/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-The master branch has no content
-
-Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6
-If you find this file in a distro specific branch, it means that no content has been checked in yet
diff --git a/SOURCES/etcd.conf b/SOURCES/etcd.conf
new file mode 100644
index 0000000..bd091f5
--- /dev/null
+++ b/SOURCES/etcd.conf
@@ -0,0 +1,34 @@
+# This configuration file is written in [TOML](https://github.com/mojombo/toml)
+
+# addr = "127.0.0.1:4001"
+# bind_addr = "127.0.0.1:4001"
+# ca_file = ""
+# cert_file = ""
+# cors = []
+# cpu_profile_file = ""
+data_dir = "/var/lib/etcd/default.etcd/"
+# discovery = "http://etcd.local:4001/v2/keys/_etcd/registry/examplecluster"
+# http_read_timeout = 10
+# http_write_timeout = 10
+# key_file = ""
+# peers = []
+# peers_file = ""
+# max_cluster_size = 9
+# max_result_buffer = 1024
+# max_retry_attempts = 3
+name = "default"
+# snapshot = false
+# verbose = false
+# very_verbose = false
+
+# [peer]
+# addr = "127.0.0.1:7001"
+# bind_addr = "127.0.0.1:7001"
+# ca_file = ""
+# cert_file = ""
+# key_file = ""
+
+# [cluster]
+# active_size = 9
+# remove_delay = 1800.0
+# sync_interval = 5.0
diff --git a/SOURCES/etcd.service b/SOURCES/etcd.service
new file mode 100644
index 0000000..fd5733c
--- /dev/null
+++ b/SOURCES/etcd.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Etcd Server
+After=network.target
+
+[Service]
+Type=simple
+# etc logs to the journal directly, suppress double logging
+StandardOutput=null
+WorkingDirectory=/var/lib/etcd
+User=etcd
+ExecStart=/usr/bin/etcd
+
+[Install]
+WantedBy=multi-user.target
diff --git a/SPECS/etcd.spec b/SPECS/etcd.spec
new file mode 100644
index 0000000..1b71526
--- /dev/null
+++ b/SPECS/etcd.spec
@@ -0,0 +1,143 @@
+%global debug_package %{nil}
+
+%global provider	github
+%global provider_tld	com
+%global project		coreos
+%global repo		etcd
+%global commit		4f330a9ba2097222a9add8136115f3a670dd0642
+
+%global import_path	%{provider}.%{provider_tld}/%{project}/%{repo}
+%global gopath		%{_datadir}/gocode
+%global shortcommit	%(c=%{commit}; echo ${c:0:7})
+
+
+Name:		etcd
+Version:	0.4.6
+Release:	0.12%{?dist}
+Summary:	A highly-available key value store for shared configuration
+
+License:	ASL 2.0
+URL:		https://github.com/coreos/etcd/
+Source0:	https://github.com/coreos/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source1:	etcd.service
+Source2:	etcd.conf
+
+ExclusiveArch:	x86_64
+
+BuildRequires:	golang
+BuildRequires:	systemd
+
+Requires(pre):	shadow-utils
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+
+%description
+A highly-available key value store for shared configuration.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+# Make link for etcd itself
+mkdir -p src/github.com/coreos
+ln -s ../../../ src/github.com/coreos/etcd
+
+%build
+./build
+
+%install
+install -d -m 0755 %{buildroot}%{_sysconfdir}/etcd
+install -m 644 -t %{buildroot}%{_sysconfdir}/etcd %{SOURCE2}
+install -D -p -m 0755 bin/etcd %{buildroot}%{_bindir}/etcd
+install -D -p -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service
+
+# And create /var/lib/etcd
+install -d -m 0755 %{buildroot}%{_localstatedir}/lib/etcd
+
+%check
+# empty for now
+
+%pre
+getent group etcd >/dev/null || groupadd -r etcd
+getent passwd etcd >/dev/null || useradd -r -g etcd -d %{_localstatedir}/lib/etcd \
+	-s /sbin/nologin -c "etcd user" etcd
+%post
+%systemd_post %{name}.service
+
+%preun
+%systemd_preun %{name}.service
+
+%postun
+%systemd_postun %{name}.service
+
+%files
+%config(noreplace) %{_sysconfdir}/etcd
+%{_bindir}/etcd
+%dir %attr(-,etcd,etcd) %{_localstatedir}/lib/etcd
+%{_unitdir}/%{name}.service
+%doc LICENSE README.md Documentation/internal-protocol-versioning.md
+
+%changelog
+* Wed Jan 21 2015 Eric Paris <eparis@redhat.com> - 0.4.6-0.12
+- set config to use /var/lib/etcd/default.etcd/ for storeage (like 2.0 will use)
+
+* Mon Oct 06 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-0.11
+- back to 0.4.6 version
+
+* Mon Oct 06 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-0.10.git4f330a9
+- replace BuildArch with ExclusiveArch
+
+* Sun Oct 05 2014 Eric Paris <eparis@redhat.com> - 0.4.6-0.9.git378cadf
+- Fix the .service file to it can launch!
+
+* Fri Oct 03 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-0.8.git378cadf
+- Bump to upstream 4f330a9ba2097222a9add8136115f3a670dd0642
+- the last commit before golang-cover (not in rhel7.1 so far)
+
+* Thu Oct 02 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-7
+- upstream commit to fix the bug caused by random iteration order over map in store/store_test.go
+- upstrema commit cc1df691cc7e752f1589fe796b7c1d589316a96f
+
+* Thu Oct 02 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-6
+- removing devel part in install section
+
+* Thu Oct 02 2014 Eric Paris <eparis@redhat.com> - 0.4.6-5
+- Clean up prep and build section
+
+* Mon Sep 22 2014 jchaloup <jchaloup@redhat.com> - 0.4.6-4
+- resolves: #1047194
+  Update to 0.4.6 from https://github.com/projectatomic/etcd-package
+
+* Tue Aug 19 2014 Adam Miller <maxamillion@fedoraproject.org> - 0.4.6-3
+- Add devel sub-package
+
+* Wed Aug 13 2014 Eric Paris <eparis@redhat.com> - 0.4.6-2
+- Bump to 0.4.6
+- run as etcd, not root
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Oct 20 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-5
+- goprotobuf library unbundled (see rhbz #1018477)
+- go-log library unbundled (see rhbz #1018478)
+- go-raft library unbundled (see rhbz #1018479)
+- go-systemd library unbundled (see rhbz #1018480)
+- kardianos library unbundled (see rhbz #1018481)
+
+* Sun Oct 13 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-4
+- go.net library unbundled (see rhbz #1018476)
+
+* Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-3
+- Prepare for packages unbundling
+- Verbose build
+
+* Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-2
+- Fix typo in the etc.service file
+
+* Sat Oct 12 2013 Peter Lemenkov <lemenkov@gmail.com> - 0.1.2-1
+- Ver. 0.1.2
+- Integrate with systemd
+
+* Mon Aug 26 2013 Luke Cypret <cypret@fedoraproject.org> - 0.1.1-1
+- Initial creation