diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/darwin-frameworks.patch b/pkgs/applications/networking/instant-messengers/chatterino2/darwin-frameworks.patch
new file mode 100644
index 0000000000000..6a8dcf9c22182
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/darwin-frameworks.patch
@@ -0,0 +1,27 @@
+Fix build on macOS.
+Patch source: https://github.com/frankosterfeld/qtkeychain/commit/95c6021e280ebe4692e7729cf626c7298db9b226
+
+commit 95c6021e280ebe4692e7729cf626c7298db9b226
+Author: Vadim Peretokin <vperetokin@gmail.com>
+Date:   Tue Sep 10 10:21:40 2019 +0200
+
+    Don't quote LIBS arguments
+
+diff --git a/lib/qtkeychain/qt5keychain.pri b/lib/qtkeychain/qt5keychain.pri
+index ee6d4e8..b3bb626 100644
+--- a/lib/qtkeychain/qt5keychain.pri
++++ b/lib/qtkeychain/qt5keychain.pri
+@@ -73,11 +73,11 @@ win32 {
+ }
+
+ macx:!ios {
+-    LIBS += "-framework Security" "-framework Foundation"
++    LIBS += -framework Security -framework Foundation
+     SOURCES += $$QT5KEYCHAIN_PWD/keychain_mac.cpp
+ }
+
+ ios {
+-    LIBS += "-framework Security" "-framework Foundation"
++    LIBS += -framework Security -framework Foundation
+     OBJECTIVE_SOURCES += $$QT5KEYCHAIN_PWD/keychain_ios.mm
+ }
diff --git a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
index 553b466b12f9c..01d8c78dd9d3c 100644
--- a/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatterino2/default.nix
@@ -2,15 +2,16 @@
 
 mkDerivation rec {
   pname = "chatterino2";
-  version = "unstable-2019-05-11";
+  version = "2.1.7";
   src = fetchFromGitHub {
-    owner = "fourtf";
+    owner = "Chatterino";
     repo = pname;
-    rev = "8c46cbf571dc8fd77287bf3186445ff52b1d1aaf";
-    sha256 = "0i2385hamhd9i7jdy906cfrd81cybw524j92l87c8pzrkxphignk";
+    rev = "v${version}";
+    sha256 = "0bbdzainfa7hlz5p0jfq4y04i3wix7z3i6w193906bi4gr9wilpg";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ];
+  patches = lib.optionals stdenv.isDarwin [ ./darwin-frameworks.patch ];
   buildInputs = [ qtbase qtsvg qtmultimedia boost openssl ];
   postInstall = lib.optionalString stdenv.isDarwin ''
     mkdir -p "$out/Applications"
@@ -26,8 +27,8 @@ mkDerivation rec {
       improved/extended version of the Twitch web chat. Chatterino 2 is
       the second installment of the Twitch chat client series
       "Chatterino".
-  '';
-    homepage = "https://github.com/fourtf/chatterino2";
+    '';
+    homepage = "https://github.com/Chatterino/chatterino2";
     license = licenses.mit;
     platforms = platforms.unix;
     maintainers = with maintainers; [ rexim ];