diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
index 99317e54b..29daf558a 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java
@@ -63,10 +63,6 @@ public class EditBean extends IndexBean {
         return port > 0 ? "" + port : "";
     }
 
-    public String getSpoofedHost(int tunnel) {
-        return DataHelper.escapeHTML(_helper.getSpoofedHost(tunnel));
-    }
-
     public String getPrivateKeyFile(int tunnel) {
         return _helper.getPrivateKeyFile(tunnel);
     }
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
index be841b817..93b2550cf 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java
@@ -542,6 +542,13 @@ public class IndexBean {
         return false;
     }
 
+    /**
+     * @since 0.9.32 moved from EditBean
+     */
+    public String getSpoofedHost(int tunnel) {
+        return DataHelper.escapeHTML(_helper.getSpoofedHost(tunnel));
+    }
+
     ///
     /// bean props for form submission
     ///
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index 1c6758c9b..240194773 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -22,11 +22,11 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <title><%=intl._t("Hidden Services Manager")%></title>
-    
+
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
     <link href="/themes/console/images/favicon.ico" type="image/x-icon" rel="shortcut icon" />
-    
+
     <% if (indexBean.allowCSS()) {
   %><link rel="icon" href="<%=indexBean.getTheme()%>images/favicon.ico" />
     <link href="<%=indexBean.getTheme()%>i2ptunnel.css?<%=net.i2p.CoreVersion.VERSION%>" rel="stylesheet" type="text/css" /> 
@@ -79,7 +79,7 @@
 </div>
 
 <div class="panel" id="servers">
-    
+
     <h2><%=intl._t("I2P Hidden Services")%></h2>
 
 <table id="serverTunnels">
@@ -95,7 +95,6 @@
         <%
         for (int curServer = 0; curServer < indexBean.getTunnelCount(); curServer++) {
             if (indexBean.isClient(curServer)) continue;
-            
       %>
 
 
@@ -166,6 +165,28 @@
       %>
         </td>
     </tr>
+
+    <tr>
+        <td class="tunnelDestination" colspan="6">
+            <span class="tunnelDestinationLabel">
+         <%
+                String name = indexBean.getSpoofedHost(curServer);
+                    if (name == null || name.equals("")) {
+                        name = indexBean.getTunnelName(curServer);
+                        out.write("<b>");
+                        out.write(intl._t("Destination"));
+                        out.write(":</b></span> ");
+                        out.write(indexBean.getDestHashBase32(curServer));
+                   } else {
+                       out.write("<b>");
+                       out.write(intl._t("Hostname"));
+                       out.write(":</b></span> ");
+                       out.write(name);
+                   }
+          %>
+        </td>
+    </tr>
+
     <tr>
         <td class="tunnelDescription" colspan="6">
             <span class="tunnelDescriptionLabel"><b>Description:</b></span>
@@ -211,7 +232,7 @@
         <%
         for (int curClient = 0; curClient < indexBean.getTunnelCount(); curClient++) {
             if (!indexBean.isClient(curClient)) continue;
-      %>        
+      %>
 
 
     <tr class="tunnelProperties">
diff --git a/history.txt b/history.txt
index deee1e0be..4dd699d1c 100644
--- a/history.txt
+++ b/history.txt
@@ -22,6 +22,8 @@
      - Add additional reachability states for clockskew and vmcomm (with icons)
    - Homepage: Add 'Customize Sidebar' link to signpost the feature now that
      there are more optional sections available (ticket #1996)
+ * I2PTunnel: Add hostname / destination (b32) information to server section on
+   index page (for parity with client tunnels section)
 
 2017-10-11 zzz
  * Console: Validate host header (thx Kevin Froman)

+ + <% + String name = indexBean.getSpoofedHost(curServer); + if (name == null \|\| name.equals("")) { + name = indexBean.getTunnelName(curServer); + out.write(""); + out.write(intl._t("Destination")); + out.write(": "); + out.write(indexBean.getDestHashBase32(curServer)); + } else { + out.write(""); + out.write(intl._t("Hostname")); + out.write(": "); + out.write(name); + } + %> +
Description: @@ -211,7 +232,7 @@ <% for (int curClient = 0; curClient < indexBean.getTunnelCount(); curClient++) { if (!indexBean.isClient(curClient)) continue; - %> + %>