6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index 41e3b547f70..82d18091050 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.musicpd.org/libs/libmpdclient/;
     license = licenses.gpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ mornfall emery ];
+    maintainers = with maintainers; [ mornfall ehmry ];
   };
 }
diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix
index 6c630d9237c..b672083340e 100644
--- a/pkgs/servers/mpd/default.nix
+++ b/pkgs/servers/mpd/default.nix
@@ -107,7 +107,7 @@ in stdenv.mkDerivation rec {
     description = "A flexible, powerful daemon for playing music";
     homepage    = http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki;
     license     = licenses.gpl2;
-    maintainers = with maintainers; [ astsmtl fuuzetsu emery ];
+    maintainers = with maintainers; [ astsmtl fuuzetsu ehmry ];
     platforms   = platforms.unix;
 
     longDescription = ''
diff --git a/pkgs/servers/polipo/default.nix b/pkgs/servers/polipo/default.nix
index 08ccbbd06c6..1ca18d7d3a7 100644
--- a/pkgs/servers/polipo/default.nix
+++ b/pkgs/servers/polipo/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.pps.jussieu.fr/~jch/software/polipo/;
     description = "A small and fast caching web proxy";
     license = licenses.mit;
-    maintainers = with maintainers; [ phreedom emery ];
+    maintainers = with maintainers; [ phreedom ehmry ];
     platforms = platforms.all;
   };
 }
\ No newline at end of file
diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix
index 808f181442a..7f9f08af002 100644
--- a/pkgs/servers/rippled/default.nix
+++ b/pkgs/servers/rippled/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Ripple P2P payment network reference server";
     homepage = https://ripple.com;
-    maintainers = with maintainers; [ emery offline ];
+    maintainers = with maintainers; [ ehmry offline ];
     license = licenses.isc;
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix
index e60a74eaf89..b42fe004af3 100644
--- a/pkgs/servers/u9fs/default.nix
+++ b/pkgs/servers/u9fs/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     { description = "Serve 9P from Unix";
       homepage = http://plan9.bell-labs.com/magic/man2html/4/u9fs;
       license = licenses.free;
-      maintainers = [ maintainers.emery ];
+      maintainers = [ maintainers.ehmry ];
       platforms = platforms.unix;
     };
 }
diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix
index a6e0d474d89..0d276c18f2d 100644
--- a/pkgs/servers/uhub/default.nix
+++ b/pkgs/servers/uhub/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     description = "High performance peer-to-peer hub for the ADC network";
     homepage = https://www.uhub.org/;
     license = licenses.gpl3;
-    maintainers = [ maintainers.emery ];
+    maintainers = [ maintainers.ehmry ];
     platforms = platforms.unix;
   };
 }
\ No newline at end of file