diff --git a/net-vpn/networkmanager-l2tp/Manifest b/net-vpn/networkmanager-l2tp/Manifest
deleted file mode 100644
index eefbb4c0c..000000000
--- a/net-vpn/networkmanager-l2tp/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST networkmanager-l2tp-0.9.8.7.tar.gz 170259 BLAKE2B b3725563493c5d63605c3ac76025aff4110ec9fa88bb638e371ae014815bbe34fc4881867ad027fe707dccc4671cbe46fd15c39217b2685999597bf31f4d2a15 SHA512 d9aa4d1c128fc48b5938ffdf9119f47a27669ed6c5777825d40917e36937fe12ea8a8b12f491629d529e758c22da718389f2eb70c7b5769d336baedf9f0c45ae
diff --git a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-0.9.8.7.ebuild b/net-vpn/networkmanager-l2tp/networkmanager-l2tp-0.9.8.7.ebuild
deleted file mode 100644
index 8ae60176e..000000000
--- a/net-vpn/networkmanager-l2tp/networkmanager-l2tp-0.9.8.7.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit autotools
-
-MY_PN="NetworkManager-l2tp"
-
-DESCRIPTION="NetworkManager L2TP plugin"
-HOMEPAGE="https://github.com/seriyps/NetworkManager-l2tp"
-SRC_URI="https://github.com/seriyps/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk nls static-libs"
-
-RDEPEND="dev-libs/dbus-glib
-	dev-libs/glib:2
-	net-dialup/ppp
-	>=net-misc/networkmanager-0.9.6.4
-	sys-apps/dbus
-	gtk? ( gnome-base/libgnome-keyring x11-libs/gtk+:3 )"
-
-DEPEND="${RDEPEND}
-	dev-perl/XML-Parser
-	dev-util/intltool
-	dev-lang/perl
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable static-libs static) \
-		$(use_with gtk gnome) \
-		--disable-more-warnings \
-		--with-dist-version=Gentoo \
-		--with-pic
-}
diff --git a/profiles/default/package.keywords/calculate b/profiles/default/package.keywords/calculate
index 2d36e80a6..3151f7822 100644
--- a/profiles/default/package.keywords/calculate
+++ b/profiles/default/package.keywords/calculate
@@ -31,6 +31,5 @@
 ~net-p2p/opentracker-20170428 amd64
 ~net-print/cnijfilter-3.80 amd64
 ~net-print/samsung-unified-linux-driver-1.05 amd64
-~net-vpn/networkmanager-l2tp-0.9.8.7 amd64
 ~net-wireless/rtl8723de-20171224 amd64
 ~www-client/opera-45.0.2552.898
diff --git a/profiles/default/package.keywords/default b/profiles/default/package.keywords/default
index b9be00d99..8354f034f 100644
--- a/profiles/default/package.keywords/default
+++ b/profiles/default/package.keywords/default
@@ -82,6 +82,7 @@
 ~media-sound/gmtp-1.3.11 amd64
 ~media-sound/gpodder-3.10.5 amd64
 ~media-sound/lxmusic-0.4.7 amd64
+~media-sound/mumble-1.3.0 amd64
 ~media-sound/picard-2.1.3 amd64
 ~media-sound/potamus-16 amd64
 ~media-sound/qastools-0.21.0 amd64
@@ -134,6 +135,7 @@ net-im/telegram-desktop-bin amd64
 ~net-print/gutenprint-5.3.3 amd64
 ~net-print/hplip-3.19.12 amd64
 ~net-print/hplip-plugin-3.19.12 amd64
+~net-vpn/networkmanager-l2tp-1.8.2 amd64
 ~net-wireless/blueman-2.1.2 amd64
 ~net-wireless/broadcom-sta-6.30.223.271 amd64
 ~sci-electronics/kicad-5.0.1 amd64
diff --git a/profiles/default/package.use/default b/profiles/default/package.use/default
index 626abbb76..13127786d 100644
--- a/profiles/default/package.use/default
+++ b/profiles/default/package.use/default
@@ -437,3 +437,6 @@ xfce-extra/xfce4-sensors-plugin lm-sensors
 
 # Enable monitoring of hdd temperature (app-admin/hddtemp)
 sys-apps/inxi hddtemp
+
+# Enable nm-applet support
+net-vpn/networkmanager-l2tp gnome