diff --git a/net-mail/muchsync/Manifest b/net-mail/muchsync/Manifest
new file mode 100644
index 0000000000000..bd1875991bb43
--- /dev/null
+++ b/net-mail/muchsync/Manifest
@@ -0,0 +1 @@
+DIST muchsync-2.tar.gz 129429 SHA256 c195bbef1c4f95da80d40ea8f3df00e3d1934f1d9238f100fd730e02d41017b7 SHA512 fcf37e67982da21fb7e6e0297b7b1f6786c991f087c53235a46856e450620b912ba5c4f7db9c7067bd1b569530efe27de205610be4bdf5ddb2b5c56453a818f9 WHIRLPOOL 01e35df7175a1cab1ee7291f4029b64cb5f368cee1efa60e801943441b9ed40e9c7c58df427a479866b7fdf5f4d8080d66902630444ca7fa929bd435a6b586d1
diff --git a/net-mail/muchsync/metadata.xml b/net-mail/muchsync/metadata.xml
new file mode 100644
index 0000000000000..fc4999f86f2e6
--- /dev/null
+++ b/net-mail/muchsync/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<longdescription lang="en">
+		Muchsync brings notmuch to all of your computers by synchronizing your
+		mail messages and notmuch tags across machines. The protocol is heavily
+		pipelined to work efficiently over high-latency networks such as mobile
+		broadband. Muchsync supports arbitrary pairwise synchronization among
+		replicas.
+	</longdescription>
+</pkgmetadata>
diff --git a/net-mail/muchsync/muchsync-2.ebuild b/net-mail/muchsync/muchsync-2.ebuild
new file mode 100644
index 0000000000000..c68b4c0b75de6
--- /dev/null
+++ b/net-mail/muchsync/muchsync-2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Synchronizes mail messages and notmuch tags across machines"
+HOMEPAGE="http://www.muchsync.org/"
+SRC_URI="http://www.muchsync.org/src/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+DEPEND="dev-db/sqlite:3
+	dev-libs/openssl:0=
+	<dev-libs/xapian-1.3
+	net-mail/notmuch:=
+	"
+RDEPEND="${DEPEND}
+	net-misc/openssh
+	"