diff --git a/net-p2p/syncthing/ChangeLog b/net-p2p/syncthing/ChangeLog
new file mode 100644
index 0000000..2fe76cd
--- /dev/null
+++ b/net-p2p/syncthing/ChangeLog
@@ -0,0 +1,4 @@
+*syncthing-0.12.12 (13 Jan 2016)
+
+  13 Jan 2016;  <chymera@gentoo.org> +syncthing-0.12.12.ebuild:
+  net-p2p/syncthing: added ebuild by mva
diff --git a/net-p2p/syncthing/Manifest b/net-p2p/syncthing/Manifest
index 3ebc250..8bdea48 100644
--- a/net-p2p/syncthing/Manifest
+++ b/net-p2p/syncthing/Manifest
@@ -1 +1,2 @@
+DIST syncthing-0.11.11.tar.gz 3217356 SHA256 ed5606305c7f365dffc364b1f72a9a521a99341ddc0cfa75e89430a7558da779 SHA512 2b79b4dcb101322370b9fd0d06e1da3f48b4622dd815884aa2ea942527e6c2937afe8ddf3d036aff05cf7f094eb710a3eb838af4ef511f6e43b37230a218f580 WHIRLPOOL 45003a21c58d959e290fca8b529ae63917496b4e6b0af63dd2d8108a57685e4fa1242133620dbebca5956ae318d793d5462273e1fbffd992f2e1453b129bbb58
 DIST syncthing-0.11.19.tar.gz 3393477 SHA256 a57bbf9264f8db03e22657958e2b0d77438acc2180be8a24a8d9965d63a00cff SHA512 2015b73022b7bcb616d5fbfef6339b6eedacbdfd40ba00887e04bdb128211eaaebcad15a4af414b5ee16111ccd5cea15e5d7d234e494c087ccccfbf8eeff0bc6 WHIRLPOOL 1c822809bf91837097d2728cb81cdc58b170be5607b5c5355bd3a7bb8f605c6ff4ca622d5fadf2fec2b8e99f12679f8768e4ce7f457ba4f8880aa7a074254038
diff --git a/net-p2p/syncthing/syncthing-0.12.12.ebuild b/net-p2p/syncthing/syncthing-0.12.12.ebuild
new file mode 100644
index 0000000..15cabf8
--- /dev/null
+++ b/net-p2p/syncthing/syncthing-0.12.12.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils base systemd git-r3
+
+DESCRIPTION="Open, trustworthy and decentralized syncing engine (some kind of analog of DropBox and 
+BTSync)"
+HOMEPAGE="http://syncthing.net"
+
+SRC_URI=""
+EGIT_REPO_URI="https://github.com/syncthing/${PN}"
+EGIT_COMMIT="v${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+# No ~x86 keyword on godep in the tree
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="systemd? ( sys-apps/systemd )"
+DEPEND="
+	dev-lang/go
+	dev-go/godep
+"
+RDEPEND="${DEPEND}"
+
+DOCS=( README.md AUTHORS LICENSE CONTRIBUTING.md )
+
+export GOPATH="${S}"
+
+GO_PN="github.com/syncthing/${PN}"
+EGIT_CHECKOUT_DIR="${S}/src/${GO_PN}"
+S="${EGIT_CHECKOUT_DIR}"
+
+src_compile() {
+	# XXX: All the stuff below needs for "-version" command to show actual info
+	local version="$(git describe --always | sed 
+'s/\([v\.0-9]*\)\(-\(beta\|alpha\)[0-9]*\)\?-/\1\2+/')";
+	local date="$(git show -s --format=%ct)";
+	local user="$(whoami)"
+	local host="$(hostname)"; host="${host%%.*}";
+	local lf="-w -X main.Version=${version} -X main.BuildStamp=${date} -X main.BuildUser=${user} -X 
+main.BuildHost=${host}"
+
+	godep go build -ldflags "${lf}" -tags noupgrade ./cmd/syncthing
+}
+
+src_install() {
+	dobin syncthing
+	systemd_dounit "${S}/etc/linux-systemd/system/${PN}@.service"
+	systemd_douserunit "${S}/etc/linux-systemd/user/${PN}.service"
+	doinitd "${FILESDIR}/syncthing"
+	base_src_install_docs
+}
+
+pkg_postinst() {
+	elog "To run Syncthing for more users, create a symlink to the syncthing init script from a link 
+called"
+	elog "syncthing.username - like so"
+	elog "	cd /etc/init.d"
+	elog "	ln -s syncthing syncthing.username"
+}