diff --git a/v2/public-resolvers.md b/v2/public-resolvers.md
index fb409563..787fd758 100644
--- a/v2/public-resolvers.md
+++ b/v2/public-resolvers.md
@@ -23,6 +23,22 @@ To use that list, add this to the `[sources]` section of your
 --
 
 
+## 36c3-ffmuc
+
+DNSCrypt resolver for the 36th Chaos Communication Congress (CCC)
+by https://ffmuc.net - Will be online starting December 27th.
+
+sdns://AQcAAAAAAAAAEjE1MS4yMTcuMTc4LjY6ODQ0MyDP8nQX-JrLW-3vXKz-7rBig9Kqj5uBZSWN4yvdmPd28h4yLmRuc2NyeXB0LWNlcnQuMzZjMy5mZm11Yy5uZXQ
+
+
+## 36c3-ffmuc-ipv6
+
+IPv6 DNSCrypt resolver for the 36th Chaos Communication Congress (CCC)
+by https://ffmuc.net - Will be online starting December 27th.
+
+sdns://AQcAAAAAAAAALVsyMDAxOjY3YzoyMGExOjExNzY6YTIyYjpiOGZmOmZlMWY6NWFjNF06ODQ0MyDP8nQX-JrLW-3vXKz-7rBig9Kqj5uBZSWN4yvdmPd28h4yLmRuc2NyeXB0LWNlcnQuMzZjMy5mZm11Yy5uZXQ
+
+
 ## a-and-a
 
 Non-logging DoH server in the UK operated by Andrews & Arnold Ltd, a
diff --git a/v2/public-resolvers.md.minisig b/v2/public-resolvers.md.minisig
index 27676570..e126937e 100644
--- a/v2/public-resolvers.md.minisig
+++ b/v2/public-resolvers.md.minisig
@@ -1,4 +1,4 @@
 untrusted comment: signature from minisign secret key
-RWQf6LRCGA9i5zmATT7oBvvzeyngdfi1R+eYN7ALUfZ5nbAB/WqUUmcppQnLTi9LtgqsvYhdVoS/JE+g30y0bL0+MfuPylyk+gU=
-trusted comment: timestamp:1577058521	file:public-resolvers.md
-rJPCgw1zAvWA51gaGeZhcpUbDXdMo5QeTU9Sd2yjwsnrjFNnPFURRFM3FP0VFiCYZ3K0moegcjlzPmROCkBpAA==
+RWQf6LRCGA9i5+EpFE22k5ZsQE+kAo0HcL9XSncr0MyaGqmzja32sP9HpVdsqeDnZP8Ge23Pz+b5yNbp8vOf1rk/VSLblA1xwQs=
+trusted comment: timestamp:1577302383	file:public-resolvers.md
+dnPVw6nasY2ggY8S/V2XPfiY+nXyALPizCeMc1YG/EHHdlb9ta1HJDmMmAGSeGTShrKkSGVe4exSLXMkLuCeDw==