diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index 5631ca7e6ca6..8c9b6f0e1b31 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -21,10 +21,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://sourceforge.net/projects/libtirpc/";
     description = "The transport-independent Sun RPC implementation (TI-RPC)";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ abbradar ];
     longDescription = ''
        Currently, NFS commands use the SunRPC routines provided by the
        glibc.  These routines do not support IPv6 addresses.  Ulrich
diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix
index 31be5eef7c8c..854a2ab94b76 100644
--- a/pkgs/servers/rpcbind/default.nix
+++ b/pkgs/servers/rpcbind/default.nix
@@ -1,24 +1,29 @@
-{ fetchurl, stdenv, libtirpc }:
+{ fetchurl, stdenv, pkgconfig, libtirpc
+, useSystemd ? true, systemd }:
 
-stdenv.mkDerivation rec {
-  name = "rpcbind-0.2.0";
+let version = "0.2.2";
+in stdenv.mkDerivation rec {
+  name = "rpcbind-${version}";
   
   src = fetchurl {
-    url = "mirror://sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2";
-    sha256 = "c92f263e0353887f16379d7708ef1fb4c7eedcf20448bc1e4838f59497a00de3";
+    url = "mirror://sourceforge/rpcbind/${version}/${name}.tar.bz2";
+    sha256 = "0acgl1c07ymnks692b90aq5ldj4h0km7n03kz26wxq6vjv3winqk";
   };
 
   patches = [ ./sunrpc.patch ];
 
-  preConfigure = ''
-    export CPPFLAGS=-I${libtirpc}/include/tirpc
-  '';
+  buildInputs = [ libtirpc ]
+             ++ stdenv.lib.optional useSystemd systemd;
 
-  buildInputs = [ libtirpc ];
+  configureFlags = stdenv.lib.optional (!useSystemd) "--with-systemdsystemunitdir=no";
 
-  meta = {
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
     description = "ONC RPC portmapper";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ abbradar ];
     longDescription = ''
       Universal addresses to RPC program number mapper.
     '';