diff --git a/media-video/budgie-media-player/Manifest b/media-video/budgie-media-player/Manifest
new file mode 100644
index 0000000..1a0cc13
--- /dev/null
+++ b/media-video/budgie-media-player/Manifest
@@ -0,0 +1,3 @@
+DIST budgie-media-player-2.tar.gz 1123448 SHA256 efa54c7dc6131af84c4e0e150888ee683c1b10e2dc3b0bc6c5b163be18d81263 SHA512 6477435bc8286eb346e6152cb5b756ff7892378dc773b93d6fedab9a8b434e923c609cb4eb0bdc81f946e00bfcf4df7d5c26775955e2b17eea6ea5f0313c1f88 WHIRLPOOL 8d2f36a128e4befbde7535477a4136b50ff5f38a9a5a1ae1ebd216e376df397eeac0585eb39c6a3ca21c459cfc5f28dd1577cf9b15a114e0a4527da3547355ee
+EBUILD budgie-media-player-2.ebuild 1025 SHA256 4d5a07a57f25af68d2e243cb2ef3598d62eee1f73ed6a0bcc7ee3c8e792719a8 SHA512 4af47fa04ad8d8b8d3f0a6f72c49477185210238cd9a950030d20db423b1dc37004a1c043628493f6f79d94c69fd8fe65d1612b6dc125e4e9d60d5fbdbed6f8d WHIRLPOOL 865874aeeaee2cb0e082cb834d5d6170d74fe1aea8e471fa688af58d2807c903b17257a28345bf34800ffc60e405206a2af571b311cb89bb32cd5e675e20fa0c
+EBUILD budgie-media-player-9999.ebuild 1117 SHA256 3ccddd1021cae415951d44bd7e2bd0efe0ade002e034a9483af934972cc9a3b4 SHA512 1b2bfcc5fbf669f8fc355acf2563a7105e62f9a0587f4f44c6db1c67095eb9b208e29a95614f593c394f466ca259ea536c2fcb60523019094ebac3d8dd68dbd5 WHIRLPOOL acb34d5e3d9bdf2faf485ec127b6bc793edcde6c483155c3c38b159bcc79382075de379becef3200a2cf3092ea76296f6e1c0107d7db13d9747c2d7d523d84e7
diff --git a/media-video/budgie-media-player/budgie-media-player-2.ebuild b/media-video/budgie-media-player/budgie-media-player-2.ebuild
new file mode 100644
index 0000000..e95455e
--- /dev/null
+++ b/media-video/budgie-media-player/budgie-media-player-2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI=5
+
+inherit gnome2
+
+DESCRIPTION="Evolve OS's Simple Media Player"
+HOMEPAGE="http://ikeydoherty.github.io/budgie/"
+
+if [[ ${PV} == "9999" ]] ; then
+    EGIT_REPO_URI="https://github.com/evolve-os/${PN}.git"
+    SRC_URI=""
+    KEYWORDS=""
+    inherit git-r3 autotools
+else
+    SRC_URI="https://github.com/evolve-os/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+    KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+    >=dev-libs/glib-2.38:2
+    >=x11-libs/gtk+-3.10.0:3
+    >=media-libs/gstreamer-1.0.10:1.0
+	>=media-libs/gst-plugins-base-1.0.1:1.0
+	media-libs/id3lib"
+
+if [[ ${PV} == "9999" ]]; then
+    RDEPEND="${RDEPEND}
+        gnome-base/gnome-common:3"
+fi
+
+DEPEND="${RDEPEND}
+    sys-libs/gdbm
+    virtual/pkgconfig"
+
+src_unpack() {
+    if [[ ${PV} == "9999" ]] ; then
+        git-r3_src_unpack
+    else
+        default_src_unpack
+    fi
+}
+
+src_prepare() {
+    ./autogen.sh
+}
diff --git a/media-video/budgie-media-player/budgie-media-player-9999.ebuild b/media-video/budgie-media-player/budgie-media-player-9999.ebuild
new file mode 100644
index 0000000..0a41b2e
--- /dev/null
+++ b/media-video/budgie-media-player/budgie-media-player-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+EAPI=5
+
+inherit gnome2
+
+DESCRIPTION="Evolve OS's Simple Media Player"
+HOMEPAGE="http://ikeydoherty.github.io/budgie/"
+
+if [[ ${PV} == "9999" ]] ; then
+    EGIT_REPO_URI="https://github.com/evolve-os/${PN}.git"
+    SRC_URI=""
+    KEYWORDS=""
+    inherit git-r3 autotools
+else
+    SRC_URI="https://github.com/evolve-os/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+    KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+    >=dev-libs/glib-2.38:2
+    >=x11-libs/gtk+-3.12.0:3
+    >=media-libs/gstreamer-1.0.10:1.0
+	>=media-libs/gst-plugins-base-1.0.1:1.0
+	>=media-libs/taglib-1.9.1"
+
+if [[ ${PV} == "9999" ]]; then
+    RDEPEND="${RDEPEND}
+        gnome-base/gnome-common:3"
+fi
+
+DEPEND="${RDEPEND}
+    sys-libs/gdbm
+    virtual/pkgconfig"
+
+src_unpack() {
+    if [[ ${PV} == "9999" ]] ; then
+        git-r3_src_unpack
+    else
+        default_src_unpack
+    fi
+}
+
+src_prepare() {
+    if [[ ${PV} == "9999" ]] ; then
+        ./autogen.sh
+    else
+        default_src_prepare
+    fi
+}