diff --git a/net-im/corebird/Manifest b/net-im/corebird/Manifest
new file mode 100644
index 0000000..aabc3f1
--- /dev/null
+++ b/net-im/corebird/Manifest
@@ -0,0 +1,3 @@
+DIST corebird-1.6.tar.gz 524906 SHA256 95eb5f9c86c08d409a2041e910914cf3e4dc06e1bae16f0adf1ffeb9f5bd05c6 SHA512 4ece734591ce4fdf3f2b7eb343365f436764389f86a872b57c95a5aea99b9c5f827d01417c996e7243dd6675ac5e4456aafa9468601d6d39f2b9efb7402d88dc WHIRLPOOL ff588ed52828439d6a898cb02191004966246e4e61b715125254242dfc3c72f6d1d4d1c6508793b47b164af00a4b68b4ee284b01264adbb4c78e21ec8cb5848f
+EBUILD corebird-1.6.ebuild 1402 SHA256 c0dbae5f18fc9e9c9eee52e340054bc3d207226b241f6be949a9b043348a5b05 SHA512 87cafba05dca4a2f1744d5f3994e917555407979f629328d4e09df91f5acf6b4aa5cfa63341584038762704c3abc866935b598c3a8ece8dd80f51b5597d35f03 WHIRLPOOL 96ac56494407430d0fea6581814f4321314ddacd8ea1c9769e907952843d10583b8f280d7b81637a247e4afdb330ecf48a2803a978e7facfe49c1661420615c5
+MISC metadata.xml 355 SHA256 8270feae05e8f9c8bfae87ce72f4b97ed2d9dbdaa3796dfa23537586f34b70c6 SHA512 0c263ab42c76690d418ff53490106f03c71f6aef1a1342999436537a05ed844252c722eedf70c669418023b366cbf15a5aac81ccb3396ef4326f97180601c150 WHIRLPOOL 3d550d6bbed09ece42de110251987ab4b0375ddb98c780697afc0eb2043a6d02897de81b9d58d0410f185ebdfd594a42945aa5484d96c0365355d08d5fd6cf93
diff --git a/net-im/corebird/corebird-1.6.ebuild b/net-im/corebird/corebird-1.6.ebuild
new file mode 100644
index 0000000..dc039df
--- /dev/null
+++ b/net-im/corebird/corebird-1.6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VALA_MIN_API_VERSION=0.34
+
+inherit autotools gnome2 vala virtualx
+
+DESCRIPTION="Native GTK+3 Twitter client"
+HOMEPAGE="http://corebird.baedert.org/"
+SRC_URI="https://github.com/baedert/corebird/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gstreamer spellcheck"
+
+RDEPEND="dev-db/sqlite:3
+	>=dev-libs/glib-2.44:2
+	dev-libs/json-glib
+	gstreamer? ( media-plugins/gst-plugins-meta:1.0[X]
+		media-libs/gst-plugins-base:1.0[X]
+		>=media-libs/gst-plugins-bad-1.6:1.0[X,gtk]
+		media-libs/gst-plugins-good:1.0
+		media-plugins/gst-plugins-libav:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-hls:1.0 )
+	spellcheck? ( >=app-text/gspell-1.0[vala] )
+	>=net-libs/libsoup-2.42.3.1
+	>=x11-libs/gtk+-3.20:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)
+	>=dev-util/intltool-0.40
+	sys-apps/sed
+	virtual/pkgconfig"
+
+src_prepare() {
+	sed -i -e "/highlighting/d" tests/Makefile.am || die
+	sed -i -e "/manpagedir/s/manpagedir.*/&\/man1/g" data/Makefile.am || die
+	eautoreconf
+	gnome2_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(usex gstreamer "" --disable-video)
+		--disable-gst-check
+		$(usex spellcheck "" --disable-spellcheck)
+	)
+	gnome2_src_configure "${myeconfargs[@]}"
+}
+
+src_test() {
+	virtx emake check
+}
diff --git a/net-im/corebird/metadata.xml b/net-im/corebird/metadata.xml
new file mode 100644
index 0000000..a3f91c2
--- /dev/null
+++ b/net-im/corebird/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<use>
+		<flag name="glade">Install glade catalogs for corebird</flag>
+		<flag name="spellcheck">Support spell checking</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">baedert/corebird</remote-id>
+	</upstream>
+</pkgmetadata>