diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index 031e9a9f762f..fca83dad23f1 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -1,101 +1,102 @@
     COMMENT = Peer-to-peer network applications
 
     SUBDIR += amule
     SUBDIR += amule-devel
     SUBDIR += awgg
     SUBDIR += bazarr
     SUBDIR += bazarr-devel
     SUBDIR += bitcoin
     SUBDIR += bitcoin-daemon
     SUBDIR += bitcoin-utils
     SUBDIR += bitflu
     SUBDIR += bitmark
     SUBDIR += bitmark-cli
     SUBDIR += bitmark-daemon
     SUBDIR += bitmark-recorder
     SUBDIR += btcheck
     SUBDIR += btpd
     SUBDIR += c-lightning
     SUBDIR += cpuminer
     SUBDIR += createtorrent
     SUBDIR += ctcs
     SUBDIR += ctorrent
     SUBDIR += dclib
     SUBDIR += deluge
     SUBDIR += deluge-cli
     SUBDIR += ed2k
     SUBDIR += edonkey-tool-hash
     SUBDIR += eiskaltdcpp-cli
     SUBDIR += eiskaltdcpp-daemon
     SUBDIR += eiskaltdcpp-data
     SUBDIR += eiskaltdcpp-gtk
     SUBDIR += eiskaltdcpp-lib
     SUBDIR += frost
     SUBDIR += go-ethereum
     SUBDIR += go-prysm
     SUBDIR += gtk-gnutella
     SUBDIR += gtorrentviewer
     SUBDIR += jackett
     SUBDIR += jigdo
     SUBDIR += ktorrent
     SUBDIR += libbt
     SUBDIR += liberator
     SUBDIR += libktorrent
     SUBDIR += libswift
     SUBDIR += libtorrent
     SUBDIR += libtorrent-rasterbar
     SUBDIR += lidarr
     SUBDIR += linuxdcpp
     SUBDIR += litecoin
     SUBDIR += litecoin-daemon
     SUBDIR += litecoin-utils
     SUBDIR += microdc2
     SUBDIR += minder
     SUBDIR += mktorrent
     SUBDIR += mldonkey
     SUBDIR += mldonkey-core
     SUBDIR += mldonkey-gui
     SUBDIR += monero-cli
     SUBDIR += namecoin
     SUBDIR += namecoin-daemon
     SUBDIR += namecoin-utils
     SUBDIR += ncdc
     SUBDIR += opendchub
     SUBDIR += openethereum
     SUBDIR += p5-Net-BitTorrent
     SUBDIR += p5-Net-BitTorrent-File
     SUBDIR += p5-Net-BitTorrent-PeerPacket
     SUBDIR += p5-Net-DirectConnect
     SUBDIR += p5-WWW-BitTorrent
     SUBDIR += phex
     SUBDIR += py-libtorrent-rasterbar
+    SUBDIR += py-nicotine-plus
     SUBDIR += py-transmission-rpc
     SUBDIR += py-tremc
     SUBDIR += py-vertex
     SUBDIR += qbittorrent
     SUBDIR += qtum
     SUBDIR += radarr
     SUBDIR += retroshare
     SUBDIR += rslsync
     SUBDIR += rtorrent
     SUBDIR += shx
     SUBDIR += sonarr
     SUBDIR += torrent-file-editor
     SUBDIR += torrentcheck
     SUBDIR += torrentsniff
     SUBDIR += transmission
     SUBDIR += transmission-cli
     SUBDIR += transmission-daemon
     SUBDIR += transmission-gtk
     SUBDIR += transmission-qt
     SUBDIR += transmission-remote-gui
     SUBDIR += transmission-utils
     SUBDIR += udpt
     SUBDIR += uhub
     SUBDIR += vuze
     SUBDIR += xmrig
     SUBDIR += zetacoin
     SUBDIR += zetacoin-daemon
     SUBDIR += zetacoin-utils
 
 .include <bsd.port.subdir.mk>
diff --git a/net-p2p/py-nicotine-plus/Makefile b/net-p2p/py-nicotine-plus/Makefile
new file mode 100644
index 000000000000..c44bb1999077
--- /dev/null
+++ b/net-p2p/py-nicotine-plus/Makefile
@@ -0,0 +1,24 @@
+PORTNAME=	nicotine-plus
+DISTVERSION=	3.1.1
+CATEGORIES=	net-p2p python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	menelkir@itroll.org
+COMMENT=	Graphical client for the Soulseek file sharing network
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mutagen>=1.42:audio/py-mutagen@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gobject3>=3.16:devel/py-gobject3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gdbm>=3.6:databases/py-gdbm@${PY_FLAVOR}
+
+USES=		python:3.6+ gnome gettext-tools
+USE_GNOME=	gtk30
+USE_PYTHON=	distutils concurrent autoplist
+
+do-test:
+		@cd ${WRKSRC} && ${PYTHON_CMD} -v -m unittest
+
+.include <bsd.port.mk>
diff --git a/net-p2p/py-nicotine-plus/distinfo b/net-p2p/py-nicotine-plus/distinfo
new file mode 100644
index 000000000000..e3f093f61852
--- /dev/null
+++ b/net-p2p/py-nicotine-plus/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1628421612
+SHA256 (nicotine-plus-3.1.1.tar.gz) = ce8342fcbc4d6fd50b9c29465eaca45d35c8c7be0a3ef03f5c1d9a594d96ec34
+SIZE (nicotine-plus-3.1.1.tar.gz) = 1556808
diff --git a/net-p2p/py-nicotine-plus/pkg-descr b/net-p2p/py-nicotine-plus/pkg-descr
new file mode 100644
index 000000000000..2f41ba08ad54
--- /dev/null
+++ b/net-p2p/py-nicotine-plus/pkg-descr
@@ -0,0 +1,7 @@
+Nicotine-Plus is a fork of Hyriand's original Nicotine Soulseek client.
+
+Nicotine+ is an attempt to keep Nicotine working with the latest libraries,
+kill bugs, keep current with the Soulseek protocol and add some new features
+that users want and/or need. The main developer now is daelstorm.
+
+WWW: https://github.com/Nicotine-Plus/nicotine-plus/