diff --git a/krebs/3modules/default.nix b/krebs/3modules/default.nix
index 82ede952d..7f5d2c7bd 100644
--- a/krebs/3modules/default.nix
+++ b/krebs/3modules/default.nix
@@ -164,6 +164,7 @@ let
         ciko.mail = "wieczorek.stefan@gmail.com";
         Mic92.mail = "joerg@higgsboson.tk";
       in {
+        "anmeldung@eloop.org" = eloop-ml;
         "cfp@eloop.org" = eloop-ml;
         "kontakt@eloop.org" = eloop-ml;
         "root@eloop.org" = eloop-ml;
diff --git a/krebs/5pkgs/charybdis/default.nix b/krebs/5pkgs/charybdis/default.nix
deleted file mode 100644
index 6968be264..000000000
--- a/krebs/5pkgs/charybdis/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchgit, bison, flex, openssl }:
-
-stdenv.mkDerivation rec {
-  name = "charybdis-3.5.0-rc1";
-
-  src = fetchgit {
-    url = "https://github.com/atheme/charybdis.git";
-    rev = "61815bf9324e872f51255e09fe37a8c595f94a60";
-    sha256 = "1q9h7j2pm1wsbcybmm7r7hzimp1zda04lw9x2akb26l9p12zgfgc";
-  };
-
-  patches = [
-    ./remove-setenv.patch
-  ];
-
-  configureFlags = [
-    "--enable-epoll"
-    "--enable-ipv6"
-    "--enable-openssl=${openssl}"
-    "--enable-small-net"
-    "--with-program-prefix=charybdis-"
-    "--sysconfdir=/tmp"
-  ];
-
-  buildInputs = [ bison flex openssl ];
-
-  meta = {
-    description = "An extremely scalable ircd with some cooperation with the ratbox and ircu guys";
-    homepage    = https://github.com/atheme/charybdis;
-    license     = stdenv.lib.licenses.gpl2;
-    maintainers = [ stdenv.lib.maintainers.lassulus ];
-    platforms   = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/krebs/5pkgs/charybdis/remove-setenv.patch b/krebs/5pkgs/charybdis/remove-setenv.patch
deleted file mode 100644
index bbaf95e19..000000000
--- a/krebs/5pkgs/charybdis/remove-setenv.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/bandbi.c b/src/bandbi.c
-index 03dd907..3698e85 100644
---- a/src/bandbi.c
-+++ b/src/bandbi.c
-@@ -82,7 +82,6 @@ start_bandb(void)
- 	const char *suffix = "";
- #endif
-
--	rb_setenv("BANDB_DBPATH", PKGLOCALSTATEDIR "/ban.db", 1);
- 	if(bandb_path == NULL)
- 	{
- 		rb_snprintf(fullpath, sizeof(fullpath), "%s/bandb%s", PKGLIBEXECDIR, suffix);
diff --git a/krebs/5pkgs/dic/default.nix b/krebs/5pkgs/dic/default.nix
index 12cbedc60..ea70f34d7 100644
--- a/krebs/5pkgs/dic/default.nix
+++ b/krebs/5pkgs/dic/default.nix
@@ -4,9 +4,9 @@ stdenv.mkDerivation {
   name = "dic";
 
   src = fetchgit {
-    url = https://github.com/krebscode/painload;
-    rev = "35ccac73d563ad30d2851b9aeed4cfef69ff74e3";
-    sha256 = "0arsfcd8qdrqafw7cxiag7f0kn95nwxxwrs0kdzxxdryfr6l1h07";
+    url = http://cgit.ni.krebsco.de/dic;
+    rev = "refs/tags/v1.0.0";
+    sha256 = "0f3f5dqpw5y79p2k68qw6jdlkrnapqs3nvnc41zwacyhgppiww0k";
   };
 
   phases = [
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
 
       sed \
         's,^main() {$,&\n  PATH=${path}; export PATH,' \
-        < ./util/bin/dic \
+        < ./dic \
         > $out/bin/dic
 
       chmod +x $out/bin/dic
diff --git a/tv/1systems/cd.nix b/tv/1systems/cd.nix
index dd8e2cc64..108006f34 100644
--- a/tv/1systems/cd.nix
+++ b/tv/1systems/cd.nix
@@ -30,7 +30,6 @@ with import <stockholm/lib>;
     iotop
     iptables
     nethogs
-    rxvt_unicode.terminfo
     tcpdump
   ];
 }
diff --git a/tv/1systems/nomic.nix b/tv/1systems/nomic.nix
index 793e1f80b..6669b5dcf 100644
--- a/tv/1systems/nomic.nix
+++ b/tv/1systems/nomic.nix
@@ -60,7 +60,6 @@ with import <stockholm/lib>;
       esac
     '')
     gnupg
-    rxvt_unicode.terminfo
     tmux
   ];
 }
diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix
index dbf311479..87727a865 100644
--- a/tv/2configs/default.nix
+++ b/tv/2configs/default.nix
@@ -14,7 +14,7 @@ with import <stockholm/lib>;
       stockholm.file = "/home/tv/stockholm";
       nixpkgs.git = {
         url = https://github.com/NixOS/nixpkgs;
-        ref = "1e1112edc57e93046f35707b874d2a4f3ff321e6";
+        ref = "5ddaca179c15154efae4e5b7efea843d2c67cff8";
       };
     } // optionalAttrs host.secure {
       secrets-master.file = "/home/tv/secrets/master";