diff --git a/src/freedombone-utils-firewall b/src/freedombone-utils-firewall
index ecdea10d..dc943399 100755
--- a/src/freedombone-utils-firewall
+++ b/src/freedombone-utils-firewall
@@ -153,6 +153,19 @@ function configure_firewall {
     mark_completed $FUNCNAME
 }
 
+function firewall_drop_telnet {
+    if [[ $(is_completed $FUNCNAME) == "1" ]]; then
+        return
+    fi
+    # telnet isn't enabled as an input and we can also
+    # drop any outgoing telnet, just in case
+    iptables -A OUTPUT -p tcp --dport telnet -j REJECT
+    iptables -A OUTPUT -p udp --dport telnet -j REJECT
+    function_check save_firewall_settings
+    save_firewall_settings
+    mark_completed $FUNCNAME
+}
+
 function configure_firewall_ping {
     if [[ $(is_completed $FUNCNAME) == "1" ]]; then
         return
diff --git a/src/freedombone-utils-setup b/src/freedombone-utils-setup
index dd2d1442..91eeca3e 100755
--- a/src/freedombone-utils-setup
+++ b/src/freedombone-utils-setup
@@ -561,6 +561,9 @@ function setup_firewall {
     function_check configure_firewall_ping
     configure_firewall_ping
 
+    function_check firewall_drop_telnet
+    firewall_drop_telnet
+
     function_check configure_firewall_for_dns
     configure_firewall_for_dns