diff --git a/ennstatus/api/functions.py b/ennstatus/api/functions.py
--- a/ennstatus/api/functions.py
+++ b/ennstatus/api/functions.py
@@ -23,9 +23,21 @@ DATE_FORMAT = '%d-%m-%Y %H:%M:%S'
 gi4 = pygeoip.GeoIP('/usr/share/GeoIP/GeoIP.dat', pygeoip.MEMORY_CACHE)
 
 
+def check_bridge(key, server):
+
+    if key not in server:
+        raise ValueError('%s key not present!\n' % key)
+    else:
+        if server[key] not in ('True', 'False'):
+            error_message = ('%s has not the right content!'
+                             ' is: %s must be one of: True or False\n') \
+                % (key, server[key])
+            raise ValueError(error_message)
+
+
 def check_json_format(server):
 
-    for key in ('server_type', 'server_name', 'tor_status'):
+    for key in ('server_type', 'server_name', 'tor_status', 'fingerprint'):
         if key not in server:
             raise ValueError('%s key not present!\n' % key)
 
@@ -40,22 +52,12 @@ def check_json_format(server):
                          ' is: %s must be one of: Online or Offline\n') \
             % server['tor_status']
 
-    if server['server_type'] in ('Exit', 'Relay'):
-        if 'fingerprint' not in server:
-            raise ValueError('fingerprint key not present!\n')
-        else:
-            if FINGERPRINT_REGEX.match(server['fingerprint']) is None:
-                raise ValueError('fingerprint has not the right format!\n')
+    if FINGERPRINT_REGEX.match(server['fingerprint']) is None:
+        raise ValueError('fingerprint has not the right format!\n')
 
-    else:
-        if 'obfs' not in server:
-            raise ValueError('obfs key not present!\n')
-        else:
-            if server['obfs'] not in ('True', 'False'):
-                error_message = ('obfs has not the right content!'
-                                 ' is: %s must be one of: True or False\n') \
-                    % server['obfs']
-                raise ValueError(error_message)
+    if server['server_type'] == 'bridge':
+        for key in ('obfs', 'fteproxy'):
+            check_bridge(key, server)
 
     if 'ip' in server:
         if IP_REGEX.match(server['ip']) is None:
@@ -74,6 +76,7 @@ def update_server(server, ip):
 
     if server['server_type'] == 'Bridge':
         server['obfs'] = literal_eval(server['obfs'])
+        server['fteproxy'] = literal_eval(server['fteproxy'])
 
         if 'ip' in server:
             del server['ip']
diff --git a/ennstatus/templates/api/export/xml/server.xml b/ennstatus/templates/api/export/xml/server.xml
--- a/ennstatus/templates/api/export/xml/server.xml
+++ b/ennstatus/templates/api/export/xml/server.xml
@@ -5,13 +5,11 @@
     <tor_status>{{ server['tor_status'] }}</tor_status>
     <country>{{ server['country'] }}</country>
     <last_updated>{{ server['last_updated'] }}</last_updated>
-    {% if 'ip' in server %}
+    <fingerprint>{{ server['fingerprint'] }}</fingerprint>
+    {% if server['server_type'] == 'bridge' %}
+    <obfs>{{ server['obfs'] }}</obfs>
+    <fteproxy>{{ server['fteproxy'] }}</fteproxy>
+    {% else %}
     <ip>{{ server['ip'] }}</ip>
     {% endif %}
-    {% if 'fingerprint' in server %}
-    <fingerprint>{{ server['fingerprint'] }}</fingerprint>
-    {% endif %}
-    {% if 'obfs' in server %}
-    <obfs>{{ server['obfs'] }}</obfs>
-    {% endif %}
   </server>
diff --git a/ennstatus/templates/status/macros.html b/ennstatus/templates/status/macros.html
--- a/ennstatus/templates/status/macros.html
+++ b/ennstatus/templates/status/macros.html
@@ -38,9 +38,9 @@
 
 {% macro create_server_table(server_type, servers) %}
   {% if server_type in ('Exit', 'Relay') %}
-    {% set headers = ['#', 'Name', 'IP', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)'] %}
+    {% set headers = ('#', 'Name', 'IP', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'Last Updated (UTC)') %}
   {% else %}
-    {% set headers = ['#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'Last Updated (UTC)'] %}
+    {% set headers = ('#', 'Name', 'Server Status', 'Tor Status', 'Country', 'Fingerprint', 'OBFS', 'FTEProxy', 'Last Updated (UTC)') %}
   {% endif %}
   <h2>{{ server_type }}</h2>
   <table class="table table-bordered table-striped">
@@ -57,19 +57,18 @@
           <td>{{ loop.index }}</td>
           {% if server_type in ('Exit', 'Relay') %}
             <td>{{ create_name(server['server_name']) }}</td>
+            <td>{{ server['ip'] }}</td>
           {% else %}
             <td>{{ server['server_name'] }}</td>
           {% endif %}
-          {% if server_type in ('Exit', 'Relay') %}
-            <td>{{ server['ip'] }}</td>
-          {% endif %}
-          {% for status in [server['server_status'], server['tor_status']] %}
+          {% for status in (server['server_status'], server['tor_status']) %}
             <td>{{ colorize_status(status) }}</td>
           {% endfor %}
           <td>{{ create_country(server['country']) }}</td>
           <td>{{ create_fingerprint(server['fingerprint'], server['server_type']) }}</td>
           {% if server_type == 'Bridge' %}
             <td>{{ colorize_obfs(server['obfs']) }}</td>
+            <td>{{ colorize_obfs(server['fteproxy']) }}</td>
           {% endif %}
           <td>{{ server['last_updated'] }}</td>
         </tr>