diff --git a/apps/susidns/src/jsp/addressbook.jsp b/apps/susidns/src/jsp/addressbook.jsp
index 6b7801dd0..806504b51 100644
--- a/apps/susidns/src/jsp/addressbook.jsp
+++ b/apps/susidns/src/jsp/addressbook.jsp
@@ -178,7 +178,20 @@ ${book.loadBookMessages}
 </div></form>
 </c:if>
 
+<form action="export" method="GET" target="_top">
+<div id="buttons">
+<p class="buttons">
+<input type="hidden" name="book" value="${book.book}">
+<c:if test="${book.search} != null && ${book.search}.length() > 0">
+<input type="hidden" name="search" value="${book.search}">
 </c:if>
+<c:if test="${book.hasFilter}">
+<input type="hidden" name="filter" value="${book.filter}">
+</c:if>
+<input type="submit" class="export" value="<%=intl._("Export in hosts.txt format")%>" />
+</p></div></form>
+
+</c:if><% /* book.notEmpty */ %>
 
 <c:if test="${book.isEmpty}">
 <div id="book">
diff --git a/core/java/src/net/i2p/client/naming/NamingService.java b/core/java/src/net/i2p/client/naming/NamingService.java
index f45ca87c1..0a38f8186 100644
--- a/core/java/src/net/i2p/client/naming/NamingService.java
+++ b/core/java/src/net/i2p/client/naming/NamingService.java
@@ -290,6 +290,11 @@ public abstract class NamingService {
         Map<String, String> entries = getBase64Entries(options);
         out.write("# Address book: ");
         out.write(getName());
+        if (options != null) {
+            String list = options.getProperty("list");
+            if (list != null)
+                out.write(" (" + list + ')');
+        }
         out.write('\n');
         int sz = entries.size();
         if (sz <= 0) {
diff --git a/history.txt b/history.txt
index dde3fb8e2..8492ddc8a 100644
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,13 @@
+2015-05-03 zzz
+ * SusiDNS: Add export button
+
+2015-05-02 zzz
+ * Console: Fix Indonesian translations
+ * Jetty 8.1.17.v20150415
+ * Transports: Cleanup of ticket #1458 fixes
+
 2015-04-30 zzz
- * Transports:
-   - Correctly handle IPv4 firewalled, IPv6 not (ticket #1458)
+ * Transports: Correctly handle IPv4 firewalled, IPv6 not (ticket #1458)
 
 2015-04-29 zzz
  * Clock: Make forward slewing work better
diff --git a/installer/resources/themes/susidns/dark/susidns.css b/installer/resources/themes/susidns/dark/susidns.css
index fec7be2a9..a1fd6cc94 100644
--- a/installer/resources/themes/susidns/dark/susidns.css
+++ b/installer/resources/themes/susidns/dark/susidns.css
@@ -252,6 +252,12 @@ input.delete {
      min-height: 22px;
 }
 
+input.export {
+     background: #ddf url('/themes/console/images/arrow_right.png') no-repeat 2px center;
+     padding: 2px 3px 2px 20px;
+     min-height: 22px;
+}
+
 input.reload {
      background: #ddf url('/themes/console/images/arrow_refresh.png') no-repeat 2px center;
      padding: 2px 3px 2px 20px;
diff --git a/installer/resources/themes/susidns/light/susidns.css b/installer/resources/themes/susidns/light/susidns.css
index 327521230..398a369e7 100644
--- a/installer/resources/themes/susidns/light/susidns.css
+++ b/installer/resources/themes/susidns/light/susidns.css
@@ -222,6 +222,12 @@ input.delete {
      min-height: 22px;
 }
 
+input.export {
+     background: #ddf url('/themes/console/images/arrow_right.png') no-repeat 2px center;
+     padding: 2px 3px 2px 20px;
+     min-height: 22px;
+}
+
 input.reload {
      background: #ddf url('/themes/console/images/arrow_refresh.png') no-repeat 2px center;
      padding: 2px 3px 2px 20px;
diff --git a/installer/resources/themes/susidns/midnight/susidns.css b/installer/resources/themes/susidns/midnight/susidns.css
index dbe1941cd..6e4618299 100644
--- a/installer/resources/themes/susidns/midnight/susidns.css
+++ b/installer/resources/themes/susidns/midnight/susidns.css
@@ -252,6 +252,12 @@ input.delete {
      min-height: 22px;
 }
 
+input.export {
+     background: #ddf url('/themes/console/images/arrow_right.png') no-repeat 2px center;
+     padding: 2px 3px 2px 20px;
+     min-height: 22px;
+}
+
 input.reload {
      background: #ddf url('/themes/console/images/arrow_refresh.png') no-repeat 2px center;
      padding: 2px 3px 2px 20px;
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index e36cd3b14..7f4edb975 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 12;
+    public final static long BUILD = 13;
 
     /** for example "-test" */
     public final static String EXTRA = "";