diff --git a/Orbot/res/xml/preferences.xml b/Orbot/res/xml/preferences.xml
index 3089a3c5..890f910d 100644
--- a/Orbot/res/xml/preferences.xml
+++ b/Orbot/res/xml/preferences.xml
@@ -23,20 +23,36 @@ android:title="Transparent Proxying"
 android:summary="ROOTED DEVICES ONLY: Activate Tor for all web traffic and DNS"
 android:enabled="true"/>
 
-<!-- 
-
-<EditTextPreference android:key="pref_relay"
+<PreferenceCategory android:title="Relays">
+<CheckBoxPreference android:key="pref_relay"
+android:defaultValue="false"
 android:title="Relaying"
 android:summary="Enable your device to be a relay"
 android:dialogTitle="Enter Bridge Addresses"
 android:enabled="false"
 />
 
+<EditTextPreference android:key="pref_relay_port"
+android:defaultValue="9001"
+android:title="Relay Port"
+android:summary="Listening port for your Tor relay"
+android:dialogTitle="Enter OR port"
+/>
+</PreferenceCategory>
 
+<PreferenceCategory android:title="FascistFirewalling">
 <CheckBoxPreference android:defaultValue="false" 
+android:defaultValue="false"
 android:title="Fascist Firewall" android:key="pref_fascist_firewall" 
 android:summary="Run as a client behind a firewall with restrictive policies"
 android:enabled="false"></CheckBoxPreference>
- -->
 
-</PreferenceScreen>
\ No newline at end of file
+<EditTextPreference android:key="pref_fascist_firewall_ports"
+android:defaultValue="80,443"
+android:title="Reachable ports"
+android:summary="Ports reachable behind a restrictive firewall"
+android:dialogTitle="Enter ports"
+/>
+</PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/Orbot/src/org/torproject/android/TorConstants.java b/Orbot/src/org/torproject/android/TorConstants.java
index a1988804..2cfb1daa 100644
--- a/Orbot/src/org/torproject/android/TorConstants.java
+++ b/Orbot/src/org/torproject/android/TorConstants.java
@@ -34,6 +34,10 @@ public interface TorConstants {
 	public final static String PREF_BRIDGES_ENABLED = "pref_bridges_enabled";
 	public final static String PREF_BRIDGES_UPDATED = "pref_bridges_enabled";
 	public final static String PREF_BRIDGES_LIST = "pref_bridges_list";
+    public final static String PREF_RELAY = "pref_relay";
+    public final static String PREF_RELAY_PORT = "pref_relay_port";
+    public final static String PREF_FASCIST_FIREWALL = "pref_fascist_firewall";
+    public final static String PREF_FASCIST_FIREWALL_PORTS = "pref_fascist_firewall_ports";
 	public final static String PREF_TRANSPARENT = "pref_transparent";