diff --git a/pkgs/applications/networking/soulseek/nicotine-plus/default.nix b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
new file mode 100644
index 00000000000..a38a9140b49
--- /dev/null
+++ b/pkgs/applications/networking/soulseek/nicotine-plus/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchFromGitHub, python27Packages, geoip }:
+
+with stdenv.lib;
+
+python27Packages.buildPythonApplication rec {
+  pname = "nicotine-plus";
+  version = "1.4.1";
+
+  src = fetchFromGitHub {
+    owner = "Nicotine-Plus";
+    repo = "nicotine-plus";
+    rev = "4e057d64184885c63488d4213ade3233bd33e67b";
+    sha256 = "11j2qm67sszfqq730czsr2zmpgkghsb50556ax1vlpm7rw3gm33c";
+  };
+
+  propagatedBuildInputs = with python27Packages; [
+    pygtk
+    miniupnpc
+    mutagen
+    notify
+    (GeoIP.override { inherit geoip; })
+  ];
+
+  # Insert real docs directory.
+  # os.getcwd() is not needed
+  postPatch = ''
+    substituteInPlace ./pynicotine/gtkgui/frame.py \
+      --replace "paths.append(os.getcwd())" "paths.append('"$out"/doc')"
+  '';
+
+  postFixup = ''
+    mkdir -p $out/doc/
+    mv ./doc/NicotinePlusGuide $out/doc/
+    mv $out/bin/nicotine $out/bin/nicotine-plus
+  '';
+
+  meta = {
+    description = "A graphical client for the SoulSeek peer-to-peer system";
+    homepage = https://www.nicotine-plus.org;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ klntsky ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ea6131d99d7..8fafe7e9e09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18440,6 +18440,10 @@ in
 
   natron = callPackage ../applications/video/natron { };
 
+  nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus {
+    geoip = geoipWithDatabase;
+  };
+
   notion = callPackage ../applications/window-managers/notion { };
 
   openshift = callPackage ../applications/networking/cluster/openshift { };