diff --git a/dnseval.py b/dnseval.py
index 992c43b..dad57ac 100755
--- a/dnseval.py
+++ b/dnseval.py
@@ -38,23 +38,14 @@ __VERSION__ = 1.0
 __PROGNAME__ = os.path.basename(sys.argv[0])
 should_stop = False
 
-resolvers = [
-    '4.2.2.1',
-    '4.2.2.2',
-    '64.6.64.6',
-    '64.6.65.6',
-    '8.8.4.4',
-    '8.8.8.8',
-    '208.67.222.222',
-    '208.67.220.220'
-]
+resolvers = dns.resolver.get_default_resolver().nameservers
 
 
 def usage():
     print('%s version %1.1f\n' % (__PROGNAME__, __VERSION__))
     print('syntax: %s [-h] [-f server-list] [-c count] [-t type] [-w wait] hostname' % __PROGNAME__)
     print('  -h  --help      show this help')
-    print('  -f  --file      dns server list to use')
+    print('  -f  --file      dns server list to use (default: system resolvers)')
     print('  -c  --count     number of requests to send (default: 10)')
     print('  -w  --wait      maximum wait time for a reply (default: 5)')
     print('  -t  --type      DNS request record type (default: A)')
@@ -69,7 +60,7 @@ def signal_handler(sig, frame):
 
 
 def widest_len(names):
-    width = 0
+    width = 8
     for s in names:
         if len(s) > width:
             width = len(s)
@@ -169,6 +160,8 @@ def main():
                 f = flist.read().splitlines()
         else:
             f = resolvers
+        if len(f) == 0:
+            print("No nameserver specified")
         width = widest_len(f)
         blanks = (width - 5) * ' '
         print('server ', blanks, ' avg(ms)     min(ms)     max(ms)     stddev(ms)  lost(%)')
diff --git a/dnstraceroute.py b/dnstraceroute.py
index d018a58..521f274 100755
--- a/dnstraceroute.py
+++ b/dnstraceroute.py
@@ -25,6 +25,8 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+import dns.rdatatype
+import dns.resolver
 import getopt
 import os
 import signal
@@ -32,9 +34,6 @@ import socket
 import sys
 import time
 
-import dns.rdatatype
-import dns.resolver
-
 __VERSION__ = 1.0
 __PROGNAME__ = os.path.basename(sys.argv[0])
 should_stop = False
@@ -45,7 +44,7 @@ def usage():
     print('syntax: %s [-h] [-q] [-s server] [-c count] [-t type] [-w wait] hostname' % __PROGNAME__)
     print('  -h  --help      show this help')
     print('  -q  --quiet     quiet')
-    print('  -s  --server    dns server to use (default: 8.8.8.8)')
+    print('  -s  --server    dns server to use (default: first system resolver)')
     print('  -c  --count     maximum number of hops (default: 30)')
     print('  -w  --wait      maximum wait time for a reply (default: 5)')
     print('  -t  --type      DNS request record type (default: A)')
@@ -71,8 +70,7 @@ def main():
     count = 30
     timeout = 1
     quiet = False
-    dnsserver = '8.8.8.8'
-    hostname = 'wikipedia.org'
+    dnsserver = dns.resolver.get_default_resolver().nameservers[0]
     dnsport = 53
     hops = 0