diff --git a/mud b/mud
index 4bbb3bf..67f1f6a 160000
--- a/mud
+++ b/mud
@@ -1 +1 @@
-Subproject commit 4bbb3bf714056b1cae2f0e847ad4161b4ae51a70
+Subproject commit 67f1f6abc2ce6e0718ca761cb208bc063cc93ec1
diff --git a/src/main.c b/src/main.c
index 15b0c07..5571d6a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -268,6 +268,7 @@ int main (int argc, char **argv)
         { "time-tolerance", &time_tolerance, option_long   },
         { "v4only",         NULL,            option_option },
         { "v6only",         NULL,            option_option },
+        { "chacha20",       NULL,            option_option },
         { "version",        NULL,            option_option },
         { NULL },
     };
@@ -317,7 +318,9 @@ int main (int argc, char **argv)
 
     fd_set_nonblock(tun_fd);
 
-    struct mud *mud = mud_create(bind_port, v4, v6);
+    int chacha = option_is_set(opts, "chacha20");
+
+    struct mud *mud = mud_create(bind_port, v4, v6, !chacha);
 
     if (!mud) {
         gt_log("couldn't create mud\n");