diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3e681c67351..16e4c1e35ff 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -321,6 +321,7 @@
   vmandela = "Venkateswara Rao Mandela <venkat.mandela@gmail.com>";
   vozz = "Oliver Hunt <oliver.huntuk@gmail.com>";
   wedens = "wedens <kirill.wedens@gmail.com>";
+  willtim = "Tim Philip Williams <tim.williams.public@gmail.com>";
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
   wjlroe = "William Roe <willroe@gmail.com>";
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
new file mode 100644
index 00000000000..0892f889932
--- /dev/null
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, qt4, libXfixes, libXtst}:
+
+let version = "2.5.0";
+in
+stdenv.mkDerivation {
+  name = "CopyQ-${version}";
+  src  = fetchurl {
+    url    = "https://github.com/hluk/CopyQ/archive/v${version}.tar.gz";
+    sha256 = "7726745056e8d82625531defc75b2a740d3c42131ecce1f3181bc0a0bae51fb1";
+  };
+
+  buildInputs = [ cmake qt4 libXfixes libXtst ];
+
+  meta = with stdenv.lib; {
+    homepage    = "https://hluk.github.io/CopyQ";
+    description = "Clipboard Manager with Advanced Features";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ willtim ];
+    # NOTE: CopyQ supports windows and osx, but I cannot test these.
+    # OSX build requires QT5.
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b1149654e5..c387847dd27 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11265,6 +11265,8 @@ let
 
   constant-detune-chorus = callPackage ../applications/audio/constant-detune-chorus { };
 
+  copyq = callPackage ../applications/misc/copyq { };
+
   coriander = callPackage ../applications/video/coriander {
     inherit (gnome) libgnomeui GConf;
   };