diff --git a/pkgs/servers/pim6sd/default.nix b/pkgs/servers/pim6sd/default.nix
new file mode 100644
index 000000000000..6752a8089af3
--- /dev/null
+++ b/pkgs/servers/pim6sd/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, lib, autoreconfHook, yacc, flex }:
+
+stdenv.mkDerivation rec {
+  pname = "pim6sd";
+  version = "unstable-2019-05-31";
+
+  src = fetchFromGitHub {
+    owner = "troglobit";
+    repo = "pim6sd";
+    rev = "fa3909529981dd705ba9ead0517222c30c581a4e";
+    sha256 = "0x7dyark2mp9xqz9cnmmgaf0z143vxn2835clllpji4ylg77zdjw";
+  };
+
+  nativeBuildInputs = [ autoreconfHook yacc flex ];
+
+  meta = with lib; {
+    description = "PIM for IPv6 sparse mode daemon";
+    homepage = "https://github.com/troglobit/pim6sd";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ hexa ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9225edf94c0..5100dcd1e78e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6444,6 +6444,8 @@ in
 
   phodav = callPackage ../tools/networking/phodav { };
 
+  pim6sd = callPackage ../servers/pim6sd { };
+
   pinentry = libsForQt5.callPackage ../tools/security/pinentry {
     libcap = if stdenv.isDarwin then null else libcap;
   };