diff --git a/dev-go/go-md2man/Manifest b/dev-go/go-md2man/Manifest
new file mode 100644
index 0000000000000..d2f1300404627
--- /dev/null
+++ b/dev-go/go-md2man/Manifest
@@ -0,0 +1 @@
+DIST go-md2man-1.0.3.tar.gz 3279 SHA256 25f96e2a05513d76ccd1a29f8f2813865f93643623a5d208ae5cc180531e0040 SHA512 855809f068daae2becb31d4b182b0953a9a11428cf89d488e2148256c6f4292bf24d42bd1c5bc96ba2c1c18a8201e859629f2515f750de390e4325cc320ac7b8 WHIRLPOOL 20da88491e60d1b0ebbbea4e798bf69cc91f7eefaa81b6f9f866f235e21674d31c76d7f62149526132e1578c9a41c57e193154f7c13a1dd1875ca917390bc0a2
diff --git a/dev-go/go-md2man/go-md2man-1.0.3.ebuild b/dev-go/go-md2man/go-md2man-1.0.3.ebuild
new file mode 100644
index 0000000000000..ece084e9d05af
--- /dev/null
+++ b/dev-go/go-md2man/go-md2man-1.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+EGO_PN=github.com/cpuguy83/go-md2man
+
+if [[ ${PV} = *9999* ]]; then
+	inherit golang-vcs
+else
+	KEYWORDS="~amd64"
+	EGIT_COMMIT=v${PV}
+	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	inherit golang-vcs-snapshot
+fi
+inherit golang-build
+
+DESCRIPTION="A utility to convert markdown to man pages"
+HOMEPAGE="https://github.com/cpuguy83/go-md2man"
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+DEPEND="dev-go/blackfriday"
+RDEPEND=""
+
+src_install() {
+	"${S}"/go-md2man -in src/${EGO_PN}/go-md2man.1.md -out go-md2man.1
+	dobin go-md2man
+	doman go-md2man.1
+}
diff --git a/dev-go/go-md2man/metadata.xml b/dev-go/go-md2man/metadata.xml
new file mode 100644
index 0000000000000..8a70a0ecf326a
--- /dev/null
+++ b/dev-go/go-md2man/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<longdescription lang="en">
+	</longdescription>
+</pkgmetadata>