diff --git a/app-eselect/eselect-ctags/Manifest b/app-eselect/eselect-ctags/Manifest
new file mode 100644
index 0000000..d00d723
--- /dev/null
+++ b/app-eselect/eselect-ctags/Manifest
@@ -0,0 +1,3 @@
+AUX eselect-ctags-1.18_add-universal-ctags.patch 433 SHA256 53a4111bcb31d8f510010cb091b7e96fbd083c7be4045e03ab641b38ecbebf93 SHA512 ae303815c57ebb993737757a0739ede3404ba94cc2aa06d2782543f0c0adf2d013b19e0a77d191da0ee839cd00aa85baef34786d2abab9182ae36efb074bf784 WHIRLPOOL 72f565b8be36771e2bc1a26ab372c9df933af30149612742fdabdaac635cd32dca6fc8fcfe77185f5cf93760089f66f102f958dac4ff0176f5f5095fc471f92a
+DIST eselect-emacs-1.18.tar.xz 8964 SHA256 72e59fc780bfe18aa782862609e2651a0fd14bf381a4529bf5a1d6ab1c1b90df SHA512 9e346dc2331e577716945360de199848606d6b67776c1e7875d1437ff7e03796ac64cd0a3656109be87c0578b45bee1175f0ba4af2be96d0e27442d51bf182aa WHIRLPOOL 6812d8a4e79fc2286715219f5f443ed0aa662249bea3d381e293dd21324b1887bc674f3f7fa7bc94643f555bbd341969b1198f305a60043183e9fdcab31759f9
+EBUILD eselect-ctags-1.18-r10.ebuild 949 SHA256 a9d0c9fa7b6aa31ce338d9c9899ffab2e7af485f9feae119345724d8b730e23e SHA512 610448b1faddd8f7c642a8b38112ddcf9fcdf328e17da19f74a95ad155d8fb6a5879d135ca53eeb14b5adae69344abaf04b36b071b3b3ab720e1e8d0726d1794 WHIRLPOOL 8486dad149e0267d5a64f3cccae961cb68976aed79d29d12331d3a26854f141aef5890cab26b04f6378718b5651eec4433308d5782489df69cadd18ac21dec21
diff --git a/app-eselect/eselect-ctags/eselect-ctags-1.18-r10.ebuild b/app-eselect/eselect-ctags/eselect-ctags-1.18-r10.ebuild
new file mode 100644
index 0000000..b6d6182
--- /dev/null
+++ b/app-eselect/eselect-ctags/eselect-ctags-1.18-r10.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils
+
+MY_P="eselect-emacs-${PV}"
+DESCRIPTION="Manages ctags implementations"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Emacs"
+SRC_URI="https://dev.gentoo.org/~ulm/emacs/${MY_P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="!<app-eselect/eselect-emacs-1.18
+	>=app-admin/eselect-1.2.3"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}_add-universal-ctags.patch 
+	eapply_user
+}
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins {ctags,etags}.eselect
+	doman {ctags,etags}.eselect.5
+}
diff --git a/app-eselect/eselect-ctags/files/eselect-ctags-1.18_add-universal-ctags.patch b/app-eselect/eselect-ctags/files/eselect-ctags-1.18_add-universal-ctags.patch
new file mode 100644
index 0000000..5e9ebaa
--- /dev/null
+++ b/app-eselect/eselect-ctags/files/eselect-ctags-1.18_add-universal-ctags.patch
@@ -0,0 +1,11 @@
+diff -Naur eselect-emacs-1.18/ctags.eselect eselect-emacs-1.18-mod/ctags.eselect
+--- eselect-emacs-1.18/ctags.eselect	2014-12-19 19:55:41.000000000 +0100
++++ eselect-emacs-1.18-mod/ctags.eselect	2016-11-16 17:41:56.911004154 +0100
+@@ -44,6 +44,7 @@
+ 
+ 	# Exuberant ctags
+ 	[[ -f ${EROOT}/usr/bin/exuberant-ctags ]] && echo exuberant-ctags
++	[[ -f ${EROOT}/usr/bin/universal-ctags ]] && echo universal-ctags
+ }
+ 
+ remove_symlinks() {
diff --git a/dev-util/universal-ctags/Manifest b/dev-util/universal-ctags/Manifest
new file mode 100644
index 0000000..8b3cf47
--- /dev/null
+++ b/dev-util/universal-ctags/Manifest
@@ -0,0 +1 @@
+EBUILD universal-ctags-9999.ebuild 786 SHA256 a5c1f8752b1a4cfddf1af065539e3438bd55c2ff0ddeeeaab6884362f5a3eca4 SHA512 932a6ff0ed9f018afaa3a6f87626e92b9469aaa43a88cbe43b619b2f763c08264078693a95309f4e9946ae66fedf38b26058615a5222b1cc8815bd1fc634b646 WHIRLPOOL 8874223e57650bba95a56a2f36668f780341b12b90a3022a7d5e58c14248e5de50fc73c662dabd392c77d5ad72a1f61b37f11ecc9d04d6faa676964d947a1f80
diff --git a/dev-util/universal-ctags/universal-ctags-9999.ebuild b/dev-util/universal-ctags/universal-ctags-9999.ebuild
new file mode 100644
index 0000000..0e78c2e
--- /dev/null
+++ b/dev-util/universal-ctags/universal-ctags-9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools git-r3
+
+DESCRIPTION="A maintained ctags implementation"
+HOMEPAGE="https://ctags.io"
+EGIT_REPO_URI="https://github.com/universal-ctags/ctags"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="app-eselect/eselect-ctags"
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && ./autogen.sh
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-readlib \
+		--disable-etags \
+		--program-prefix=universal- \
+		--enable-tmpdir=/tmp
+}
+
+pkg_postinst() {
+	eselect ctags update
+	elog "You can set the version to be started by /usr/bin/ctags through"
+	elog "the ctags eselect module. \"man ctags.eselect\" for details."
+}
+
+pkg_postrm() {
+	eselect ctags update
+}