diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc
index b71bebe..ebcb408 100644
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/common.inc
@@ -39,8 +39,6 @@ RESOLVERS_UPDATES_BASE_URL="http://download.dnscrypt.org/dnscrypt-proxy"
 RESOLVERS_LIST_BASE_DIR="/usr/local/share/dnscrypt-proxy"
 RESOLVERS_LIST_PUBLIC_KEY="RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3"
 
-DEFAULT_RESOLVER_NAME='opendns'
-
 INTERFACE_UNBOUND="127.0.0.53"
 INTERFACE_UNBOUND_MASK="24"
 INTERFACE_PROXY="127.0.0.54"
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-dnscrypt-resolver-name.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-dnscrypt-resolver-name.sh
index 5d87548..0590aa6 100755
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-dnscrypt-resolver-name.sh
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-dnscrypt-resolver-name.sh
@@ -4,5 +4,5 @@
 
 [ -r "$DNSCRYPT_RESOLVER_NAME_FILE" ] && \
   sed 's/[^a-zA-Z0-9.-]/_/g' < "$DNSCRYPT_RESOLVER_NAME_FILE" && exit 0
-echo "$DEFAULT_RESOLVER_NAME"
-exit 0
+
+exec ./get-random-resolver.sh
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-random-resolver.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-random-resolver.sh
new file mode 100755
index 0000000..6c6e2b5
--- /dev/null
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/get-random-resolver.sh
@@ -0,0 +1,8 @@
+#! /bin/sh
+
+. ./common.inc
+
+(read header; fgrep -v :: | cut -d, -f1 | egrep -v '^\s*$') \
+  < "${RESOLVERS_LIST_BASE_DIR}/dnscrypt-resolvers.csv" | \
+  perl -MList::Util=shuffle -e 'print shuffle(<STDIN>);' | \
+  head -n1