diff --git a/src/freedombone-sec b/src/freedombone-sec
index 6609797f..6dffe130 100755
--- a/src/freedombone-sec
+++ b/src/freedombone-sec
@@ -767,9 +767,9 @@ function add_tor_bridge {
     dialog --backtitle $"Freedombone Control Panel" \
            --title $"Add obfs4 Tor bridge" \
            --form "\n" 9 60 4 \
-           $"IP address:" 1 1 "   .   .   .   " 1 15 16 16 \
-           $"Port:      " 2 1 "" 2 15 5 5 \
-           $"Key:       " 3 1 "" 3 15 250 250 \
+           $"IP address:   " 1 1 "   .   .   .   " 1 17 16 16 \
+           $"Port:         " 2 1 "" 2 17 5 5 \
+           $"Key/Nickname: " 3 1 "" 3 17 250 250 \
            2> $data
     sel=$?
     case $sel in
@@ -821,16 +821,61 @@ function remove_tor_bridge {
            --msgbox $"Bridge removed" 6 40
 }
 
+function add_tor_bridge_relay {
+    read_config_param 'TOR_BRIDGE_NICKNAME'
+    read_config_param 'TOR_BRIDGE_PORT'
+
+    # remove any previous bridge port from the firewall
+    if [ ${#TOR_BRIDGE_PORT} -gt 0 ]; then
+        firewall_remove $TOR_BRIDGE_PORT tcp
+    fi
+
+    data=$(tempfile 2>/dev/null)
+    trap "rm -f $data" 0 1 2 5 15
+    dialog --backtitle $"Freedombone Control Panel" \
+           --title $"Become an obfs4 Tor bridge relay" \
+           --form "\n" 8 60 2 \
+           $"Bridge Nickname: " 1 1 "$TOR_BRIDGE_NICKNAME" 1 20 250 250 \
+           2> $data
+    sel=$?
+    case $sel in
+        1) return;;
+        255) return;;
+    esac
+    bridge_nickname=$(cat $data | sed -n 1p)
+    if [[ "${bridge_nickname}" == *" "* ]]; then
+        return
+    fi
+    if [ ${#bridge_nickname} -eq 0 ]; then
+        return
+    fi
+    TOR_BRIDGE_NICKNAME="$bridge_nickname"
+    TOR_BRIDGE_PORT=$((20000 + RANDOM % 40000))
+    write_config_param 'TOR_BRIDGE_NICKNAME' "$TOR_BRIDGE_NICKNAME"
+    write_config_param 'TOR_BRIDGE_PORT' "$TOR_BRIDGE_PORT"
+    tor_create_bridge_relay
+    dialog --title $"You are now an obfs4 Tor bridge relay" \
+           --msgbox $"\nIP address: $(get_ipv4_address)\n\nPort: ${TOR_BRIDGE_PORT}\n\nNickname: ${TOR_BRIDGE_NICKNAME}" 10 65
+}
+
+function remove_tor_bridge_relay {
+    tor_remove_bridge_relay
+    dialog --title $"Remove Tor bridge relay" \
+           --msgbox $"Bridge relay removed" 10 60
+}
+
 function menu_tor_bridges {
     data=$(tempfile 2>/dev/null)
     trap "rm -f $data" 0 1 2 5 15
     dialog --backtitle $"Freedombone Control Panel" \
            --title $"Tor Bridges" \
-           --radiolist $"Choose an operation:" 12 50 4 \
+           --radiolist $"Choose an operation:" 14 50 6 \
            1 $"Show bridges" off \
            2 $"Add a bridge" off \
            3 $"Remove a bridge" off \
-           4 $"Go Back/Exit" on 2> $data
+           4 $"Make this system into a bridge" off \
+           5 $"Stop being a bridge" off \
+           6 $"Go Back/Exit" on 2> $data
     sel=$?
     case $sel in
         1) exit 1;;
@@ -851,6 +896,14 @@ function menu_tor_bridges {
             exit 0
             ;;
         4)
+            add_tor_bridge_relay
+            exit 0
+            ;;
+        5)
+            remove_tor_bridge_relay
+            exit 0
+            ;;
+        6)
             exit 0
             ;;
     esac
diff --git a/src/freedombone-utils-onion b/src/freedombone-utils-onion
index e38c27d9..279fa695 100755
--- a/src/freedombone-utils-onion
+++ b/src/freedombone-utils-onion
@@ -466,26 +466,40 @@ function tor_remove_bridge {
 }
 
 function tor_create_bridge_relay {
+    read_config_param 'TOR_BRIDGE_PORT'
+    read_config_param 'TOR_BRIDGE_NICKNAME'
+    if [ ! $TOR_BRIDGE_PORT ]; then
+        return
+    fi
+    if [ ${#TOR_BRIDGE_PORT} -eq 0 ]; then
+        return
+    fi
+    if [ ${#TOR_BRIDGE_NICKNAME} -eq 0 ]; then
+        return
+    fi
+
     apt-get -yq install obfs4proxy
 
     sed -i 's|#BridgeRelay.*|BridgeRelay 1|g' /etc/tor/torrc
     sed -i 's|BridgeRelay.*|BridgeRelay 1|g' /etc/tor/torrc
     sed -i 's|#ServerTransportPlugin.*|ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy|g' /etc/tor/torrc
     sed -i 's|ServerTransportPlugin.*|ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy|g' /etc/tor/torrc
+
     if ! grep 'ExtORPort ' /etc/tor/torrc; then
-        echo 'ExtORPort auto' >> /etc/tor/torrc
+        echo "ExtORPort $TOR_BRIDGE_PORT" >> /etc/tor/torrc
     else
-        sed -i 's|#ExtORPort auto|ExtORPort auto|g' /etc/tor/torrc
-        sed -i 's|ExtORPort .*|ExtORPort auto|g' /etc/tor/torrc
+        sed -i "s|#ExtORPort .*|ExtORPort $TOR_BRIDGE_PORT|g" /etc/tor/torrc
+        sed -i "s|ExtORPort .*|ExtORPort $TOR_BRIDGE_PORT|g" /etc/tor/torrc
     fi
 
-    read_config_param MY_'EMAIL_ADDRESS'
-    read_config_param 'TOR_BRIDGE_NICKNAME'
+    read_config_param 'MY_EMAIL_ADDRESS'
 
-    sed -i "s|#ContactInfo|ContactInfo $MY_EMAIL_ADDRESS|g" /etc/tor/torrc
+    sed -i "s|#ContactInfo.*|ContactInfo $MY_EMAIL_ADDRESS|g" /etc/tor/torrc
     if [ $TOR_BRIDGE_NICKNAME ]; then
-        sed -i "s|#Nickname|Nickname $TOR_BRIDGE_NICKNAME|g" /etc/tor/torrc
+        sed -i "s|#Nickname.*|Nickname $TOR_BRIDGE_NICKNAME|g" /etc/tor/torrc
+        sed -i "s|Nickname.*|Nickname $TOR_BRIDGE_NICKNAME|g" /etc/tor/torrc
     fi
+    firewall_add tor_bridge $TOR_BRIDGE_PORT tcp
     systemctl restart tor
 }
 
@@ -505,6 +519,8 @@ function tor_remove_bridge_relay {
     if ! grep '#Nickname ' /etc/tor/torrc; then
         sed -i "s|Nickname |#Nickname |g" /etc/tor/torrc
     fi
+    read_config_param 'TOR_BRIDGE_PORT'
+    firewall_remove $TOR_BRIDGE_PORT tcp
     systemctl restart tor
 }