diff --git a/ChangeLog b/ChangeLog
index aac98ff998..788658da5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,8 @@ Changes in version 0.2.1.12-alpha - 2009-02-??
     - Resolve a very rare crash bug that could occur when the user forced
       a nameserver reconfiguration during the middle of a nameserver
       probe.  Fixes bug 526.  Bugfix on 0.1.2.1-alpha.
+    - Support changing value of ServerDNSRandomizeCase during SIGHUP.
+      Bugfix on 0.2.1.7-alpha.
 
   o Minor features:
     - Support platforms where time_t is 64 bits long. (Congratulations,
diff --git a/src/or/dns.c b/src/or/dns.c
index d57e8fc562..74d187be58 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -197,10 +197,6 @@ dns_init(void)
 {
   init_cache_map();
   evdns_set_random_bytes_fn(_dns_randfn);
-  if (get_options()->ServerDNSRandomizeCase)
-    evdns_set_option("randomize-case:", "1", DNS_OPTIONS_ALL);
-  else
-    evdns_set_option("randomize-case:", "0", DNS_OPTIONS_ALL);
   if (server_mode(get_options())) {
     int r = configure_nameservers(1);
     return r;
@@ -1121,6 +1117,11 @@ configure_nameservers(int force)
     }
   }
 
+  if (options->ServerDNSRandomizeCase)
+    evdns_set_option("randomize-case:", "1", DNS_OPTIONS_ALL);
+  else
+    evdns_set_option("randomize-case:", "0", DNS_OPTIONS_ALL);
+
   evdns_set_log_fn(evdns_log_cb);
   if (conf_fname) {
     if (stat(conf_fname, &st)) {