diff --git a/net-p2p/nicotine-plus/Makefile b/net-p2p/nicotine-plus/Makefile
new file mode 100644
index 000000000000..3d11b43e5c56
--- /dev/null
+++ b/net-p2p/nicotine-plus/Makefile
@@ -0,0 +1,25 @@
+PORTNAME=	nicotine-plus
+PORTVERSION=	3.0.6
+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>0:audio/py-mutagen@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}gdbm>0: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} -m unittest
+
+.include <bsd.port.mk>
diff --git a/net-p2p/nicotine-plus/distinfo b/net-p2p/nicotine-plus/distinfo
new file mode 100644
index 000000000000..57acc1283821
--- /dev/null
+++ b/net-p2p/nicotine-plus/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1624822273
+SHA256 (nicotine-plus-3.0.6.tar.gz) = 06c6456c71943b35b3b23d3d958ab8c34e6471da0e46a615ba53dfb4db2a408c
+SIZE (nicotine-plus-3.0.6.tar.gz) = 1578914
diff --git a/net-p2p/nicotine-plus/pkg-descr b/net-p2p/nicotine-plus/pkg-descr
new file mode 100644
index 000000000000..2f41ba08ad54
--- /dev/null
+++ b/net-p2p/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/