diff --git a/tools/naptr-eduroam.sh b/tools/naptr-eduroam.sh
index 5402d18..1d45c4d 100755
--- a/tools/naptr-eduroam.sh
+++ b/tools/naptr-eduroam.sh
@@ -38,7 +38,7 @@ dig_it_srv() {
 }
 
 dig_it_naptr() {
-    ${DIGCMD} +short naptr ${REALM} | grep x-eduroam:radius.tls | sort -n -k1 |
+    ${DIGCMD} +short naptr "${REALM}" | grep x-eduroam:radius.tls | sort -n -k1 |
     while read line; do
         set $line ; TYPE=$3 ; HOST=$(validate_host $6)
         if ( [ "$TYPE" = "\"s\"" ] || [ "$TYPE" = "\"S\"" ] ) && [ -n "${HOST}" ]; then
@@ -59,7 +59,7 @@ host_it_srv() {
 }
 
 host_it_naptr() {
-    ${HOSTCMD} -t naptr ${REALM} | grep x-eduroam:radius.tls | sort -n -k5 |
+    ${HOSTCMD} -t naptr "${REALM}" | grep x-eduroam:radius.tls | sort -n -k5 |
     while read line; do
         set $line ; TYPE=$7 ; HOST=$(validate_host ${10})
         if ( [ "$TYPE" = "\"s\"" ] || [ "$TYPE" = "\"S\"" ] ) && [ -n "${HOST}" ]; then
diff --git a/tools/radsec-dynsrv.sh b/tools/radsec-dynsrv.sh
index 68bb5ba..9ea182c 100755
--- a/tools/radsec-dynsrv.sh
+++ b/tools/radsec-dynsrv.sh
@@ -28,7 +28,7 @@ validate_port() {
 }
 
 dig_it() {
-   ${DIGCMD} +short srv _radsec._tcp.${REALM} | sort -n -k1 |
+   ${DIGCMD} +short srv "_radsec._tcp.${REALM}" | sort -n -k1 |
    while read line ; do
       set $line ; PORT=$(validate_port $3) ; HOST=$(validate_host $4)
       if [ -n "${HOST}" ] && [ -n "${PORT}" ]; then 
@@ -38,7 +38,7 @@ dig_it() {
 }
 
 host_it() {
-   ${HOSTCMD} -t srv _radsec._tcp.${REALM} | sort -n -k5 |
+   ${HOSTCMD} -t srv "_radsec._tcp.${REALM}" | sort -n -k5 |
    while read line ; do
       set $line ; PORT=$(validate_port $7) ; HOST=$(validate_host $8) 
       if [ -n "${HOST}" ] && [ -n "${PORT}" ]; then