diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
new file mode 100644
index 000000000000..f07cfe4d0724
--- /dev/null
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, libsodium }:
+
+stdenv.mkDerivation rec {
+  name = "quicktun-${version}";
+  version = "2.2.4";
+
+  src = fetchFromGitHub {
+    owner = "UCIS";
+    repo = "QuickTun";
+    rev = "980fe1b8c718d6df82af1d57b56140c0e541dbe0";
+    sha256 = "0m7gvlgs1mhyw3c8s2dg05j7r7hz8kjpb0sk245m61ir9dmwlf8i";
+  };
+
+  CFLAGS = "-fPIE -fPIC -pie -fstack-protector-all -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro,-z,now";
+
+  buildInputs = [ libsodium ];
+
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  buildPhase = "bash build.sh";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    rm out/quicktun*tgz
+    cp -v out/quicktun* $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Very simple, yet secure VPN software";
+    homepage = "http://wiki.ucis.nl/QuickTun";
+    maintainers = [ maintainers.fpletz ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de648bc16f65..08517163ebc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3011,6 +3011,8 @@ let
 
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
+  quicktun = callPackage ../tools/networking/quicktun { };
+
   quilt = callPackage ../development/tools/quilt { };
 
   radamsa = callPackage ../tools/security/radamsa { };