diff --git a/net-misc/frr/frr-3.0.ebuild b/net-misc/frr/frr-3.0.ebuild
new file mode 100644
index 0000000..9626c44
--- /dev/null
+++ b/net-misc/frr/frr-3.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
+
+inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd tmpfiles user vcs-snapshot
+
+DESCRIPTION="Free Range Routing Protocol Suite, fork of Quagga"
+HOMEPAGE="https://frrouting.org/"
+SRC_URI="https://github.com/FRRouting/frr/archive/${P}.tar.gz
+	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="bgpclassless caps fpm doc elibc_glibc ipv6 multipath nhrpd ospfapi pam protobuf +readline shell-access snmp"
+
+COMMON_DEPEND="
+	!!net-misc/quagga
+	dev-libs/json-c:0=
+	caps? ( sys-libs/libcap )
+	nhrpd? ( net-dns/c-ares:0= )
+	protobuf? ( dev-libs/protobuf-c:0= )
+	readline? (
+		sys-libs/readline:0=
+		pam? ( sys-libs/pam )
+	)
+	snmp? ( net-analyzer/net-snmp )
+	!elibc_glibc? ( dev-libs/libpcre )"
+DEPEND="${COMMON_DEPEND}
+	dev-perl/XML-LibXML
+	sys-apps/gawk
+	sys-devel/libtool:2"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.0-ipctl-forwarding.patch"
+)
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
+You have to create config files in /etc/frr before
+starting one of the daemons.
+
+You can pass additional options to the daemon by setting the EXTRA_OPTS
+variable in their respective file in /etc/conf.d"
+
+pkg_setup() {
+	enewgroup quagga
+	enewuser quagga -1 -1 /var/empty quagga
+}
+
+src_prepare() {
+	# Classless prefixes for BGP
+	# http://hasso.linux.ee/doku.php/english:network:quagga
+	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
+
+	eapply "${PATCHES[@]}"
+	eapply_user
+	eautoreconf
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	# do not build PDF docs
+	export ac_cv_prog_PDFLATEX=no
+	export ac_cv_prog_LATEXMK=no
+
+	econf \
+		--enable-exampledir=/usr/share/doc/${PF}/samples \
+		--enable-irdp \
+		--enable-isisd \
+		--enable-ldpd \
+		--enable-pimd \
+		--enable-user=quagga \
+		--enable-group=quagga \
+		--enable-vty-group=quagga \
+		--with-pkg-extra-version="-gentoo" \
+		--sysconfdir=/etc/frr \
+		--localstatedir=/run/frr \
+		--disable-static \
+		$(use_enable caps capabilities) \
+		$(usex snmp '--enable-snmp' '' '' '') \
+		$(use_enable !elibc_glibc pcreposix) \
+		$(use_enable fpm) \
+		$(use_enable doc) \
+		$(usex multipath $(use_enable multipath) '' '=0' '') \
+		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
+		$(use_enable readline vtysh) \
+		$(use_with pam libpam) \
+		$(use_enable nhrpd) \
+		$(use_enable protobuf) \
+		$(use_enable shell-access) \
+		$(use_enable ipv6 ripngd) \
+		$(use_enable ipv6 ospf6d) \
+		$(use_enable ipv6 rtadv)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+	readme.gentoo_create_doc
+
+	keepdir /etc/frr
+	fowners root:quagga /etc/frr
+	fperms 0770 /etc/frr
+
+	# Install systemd-related stuff, bug #553136
+	dotmpfiles "${FILESDIR}/systemd/frr.conf"
+	systemd_dounit "${FILESDIR}/systemd/zebra.service"
+
+	# install zebra as a file, symlink the rest
+	newinitd "${FILESDIR}"/frr.init zebra
+
+	for service in bgpd isisd ospfd ldpd pimd ripd $(use ipv6 && echo ospf6d ripngd) $(use nhrpd && echo nhrpd); do
+		dosym zebra /etc/init.d/${service}
+		systemd_dounit "${FILESDIR}/systemd/${service}.service"
+	done
+
+	use readline && use pam && newpamd "${FILESDIR}/frr.pam" frr
+
+	insinto /etc/logrotate.d
+	newins redhat/frr.logrotate frr
+}
+
+pkg_postinst() {
+	# Path for PIDs before first reboot should be created here, bug #558194
+	tmpfiles_process frr.conf
+
+	readme.gentoo_print_elog
+}
diff --git a/net-misc/frr/metadata.xml b/net-misc/frr/metadata.xml
index 4ee9e24..01adde1 100644
--- a/net-misc/frr/metadata.xml
+++ b/net-misc/frr/metadata.xml
@@ -33,6 +33,9 @@
 			Enable support for <pkg>sys-libs/readline</pkg> to provide the Quagga Virtual Terminal
 			Interface Shell (vtysh)
 		</flag>
+		<flag name="shell-access">
+			Enable user access to shell/telnet/ssh
+		</flag>
 		<flag name="tcp-zebra">
 			Enable TCP zserv interface on port 2600 for Zebra/protocol-daemon communication. Unix domain
 			sockets are chosen otherwise