diff --git a/pkgs/servers/radius/default.nix b/pkgs/servers/radius/default.nix
new file mode 100644
index 000000000000..5533469a1da1
--- /dev/null
+++ b/pkgs/servers/radius/default.nix
@@ -0,0 +1,33 @@
+{ fetchurl, stdenv, m4, groff, readline }:
+
+stdenv.mkDerivation rec {
+  name = "radius-1.6.1";
+
+  src = fetchurl {
+    url = "mirror://gnu/radius/${name}.tar.gz";
+    sha256 = "1l4k17zkbjsmk8mqrjjymagq8a8kwgrain9mcb5zp8jaf1qbclrh";
+  };
+
+  buildInputs = [ m4 groff readline ] ;
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU Radius remote authentication and accounting system";
+
+    longDescription =
+      '' Radius is a server for remote user authentication and
+         accounting.  Its primary use is for Internet Service
+         Providers, though it may as well be used on any network that
+         needs a centralized authentication and/or accounting service
+         for its workstations.  The package includes an authentication
+         and accounting server and administrator tools.
+      '';
+
+    homepage = http://www.gnu.org/software/radius/;
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.bjg ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
new file mode 100644
index 000000000000..8b81f5290d08
--- /dev/null
+++ b/pkgs/servers/shishi/default.nix
@@ -0,0 +1,36 @@
+{ fetchurl, stdenv, libtasn1, libgcrypt, gnutls }:
+
+stdenv.mkDerivation rec {
+  name = "shishi-0.0.43";
+
+  src = fetchurl {
+    url = "ftp://alpha.gnu.org/gnu/shishi/${name}.tar.gz";
+    sha256 = "17hj4lklvprws6r5bhavi43yj3bz8sv554gcqvvsjrsq8w3qjxm0";
+  };
+
+  buildInputs = [ libtasn1 libgcrypt gnutls ] ;
+
+  doCheck = true;
+
+  meta = {
+    description = "GNU Shishi, free implementation of the Kerberos 5 network security system";
+
+    longDescription =
+      '' GNU Shishi is an implementation of the Kerberos 5 network 
+         authentication system, as specified in RFC 4120. Shishi can be 
+         used to authenticate users in distributed systems.
+
+         Shishi contains a library ('libshishi') that can be used by
+         application developers to add support for Kerberos 5.  Shishi
+         contains a command line utility ('shishi') that is used by
+         users to acquire and manage tickets (and more).  The server
+         side, a Key Distribution Center, is implemented by 'shishid'.
+       '';
+
+    homepage = http://www.gnu.org/software/shishi/;
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.bjg ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e4d88f409b5..eca83066b526 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5629,11 +5629,19 @@ let
     inherit xmpppy python makeWrapper fetchcvs;
   };
 
+  radius = import ../servers/radius {
+    inherit fetchurl stdenv m4 groff readline;
+  };
+
   samba = makeOverridable (import ../servers/samba) {
     inherit stdenv fetchurl readline openldap pam kerberos popt iniparser
   libunwind acl fam;
   };
 
+  shishi = import ../servers/shishi {
+    inherit fetchurl stdenv libtasn1 libgcrypt gnutls;
+  };
+
   squids = recurseIntoAttrs( import ../servers/squid/squids.nix {
     inherit fetchurl stdenv perl lib composableDerivation;
   });