diff --git a/gnu/local.mk b/gnu/local.mk
index 8d8f5b78a2..2f851afe4e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -389,6 +389,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/networking.scm			\
   %D%/packages/nfs.scm                          \
   %D%/packages/nickle.scm                       \
+  %D%/packages/nicotine.scm                     \
   %D%/packages/nim.scm  			\
   %D%/packages/ninja.scm			\
   %D%/packages/node.scm				\
diff --git a/gnu/packages/nicotine.scm b/gnu/packages/nicotine.scm
new file mode 100644
index 0000000000..dee2917c49
--- /dev/null
+++ b/gnu/packages/nicotine.scm
@@ -0,0 +1,68 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages nicotine)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system python)
+  #:use-module (gnu packages python-xyz)
+  #:use-module (gnu packages glib)
+  #:use-module (gnu packages gtk)
+  #:use-module (gnu packages check)
+  #:use-module (gnu packages music))
+
+(define-public nicotine+
+  (package
+    (name "nicotine+")
+    (version "2.0.1")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/Nicotine-Plus/nicotine-plus")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256 (base32 "07xagm6kwy8b6gcdv5vx78yqfllkz1gvlakkf0hi2c9ivncq457g"))))
+    (build-system python-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'install 'wrap-program
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((prog (string-append
+                          (assoc-ref outputs "out")
+                          "/bin/nicotine"))
+                   (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+               (wrap-program prog
+                 `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))
+               #t))))))
+    (inputs
+     `(("python-pygobject" ,python-pygobject)
+       ("python-mutagen" ,python-mutagen)
+       ("python-dbus" ,python-dbus)
+       ("gtk+" ,gtk+)))
+    (native-inputs
+     `(("python-pytest" ,python-pytest)))
+    (home-page "https://nicotine-plus.github.io/nicotine-plus/")
+    (synopsis "Graphical client for Soulseek")
+    (description
+     "Nicotine+ is a graphical client for the Soulseek peer-to-peer
+file sharing network.  It 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.")
+    (license license:gpl3+)))