diff --git a/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild
new file mode 100644
index 0000000..317cfd5
--- /dev/null
+++ b/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python{3_4,3_5} )
+VALA_MIN_API_VERSION="0.30"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 python-single-r1 vala virtualx
+
+DESCRIPTION="Builder attempts to be an IDE for writing software for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+introspection python vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: some unittests seem to hang forever
+RDEPEND="
+	>=dev-libs/gjs-1.42
+	>=dev-libs/glib-2.45.8:2[dbus]
+	dev-libs/libgit2[ssh,threads]
+	>=dev-libs/libgit2-glib-0.23.4[ssh]
+	>=dev-libs/libpeas-1.14.1
+	>=dev-libs/libxml2-2.9
+	dev-util/uncrustify
+	sys-devel/clang
+	dev-cpp/mm-common
+	>=x11-libs/gtk+-3.17.8:3[introspection?]
+	>=x11-libs/gtksourceview-3.17.7:3.0[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.42:= )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3 )
+	vala? ( $(vala_depend) )
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.11
+	>=dev-util/intltool-0.50.1
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	use python && export PYTHON3_CONFIG="$(python_get_PYTHON_CONFIG)"
+	gnome2_src_configure \
+		--disable-static \
+		$(use_enable introspection) \
+		$(use_enable python python-pack-plugin) \
+		$(use_enable vala vala-pack-plugin)
+}
+
+src_test() {
+	# FIXME: this should be handled at eclass level
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data/gsettings" || die
+
+	GSETTINGS_SCHEMA_DIR="${S}/data/gsettings" Xemake check
+}
diff --git a/gnome-extra/gnome-builder/metadata.xml b/gnome-extra/gnome-builder/metadata.xml
new file mode 100644
index 0000000..996e7ca
--- /dev/null
+++ b/gnome-extra/gnome-builder/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+</pkgmetadata>