diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index 9fcc9e02e..f28df8827 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -1158,7 +1158,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
     }
     public static final String DEFAULT_JUMP_SERVERS =
                                "http://i2host.i2p/cgi-bin/i2hostjump?," +
-            "http://stats.i2p/cgi-bin/jump.cgi?a=";
+            "http://stats.i2p/cgi-bin/jump.cgi?a=," +
+	    "http://no.i2p/jump/";
             //"http://i2jump.i2p/";
 
     /**
diff --git a/history.txt b/history.txt
index 517f0da6d..2beeb0b0c 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2013-10-29 meeh
+ * Adding no.i2p registrar
+
 2013-10-27 zzz
  * Streaming; Fix crash caused by previous blacklist fix (ticket #1070)
 
diff --git a/installer/resources/eepsite/docroot/help/index.html b/installer/resources/eepsite/docroot/help/index.html
index f3bf601a7..8bc537441 100644
--- a/installer/resources/eepsite/docroot/help/index.html
+++ b/installer/resources/eepsite/docroot/help/index.html
@@ -71,7 +71,7 @@
 </ul>
 <h2>Register your own .I2P Domain</h2><ul>
  <li>Now it's time to add your eepsite to an I2P address book hosted by a site
-     such as <a href="http://stats.i2p/">stats.i2p</a>.
+     such as <a href="http://stats.i2p/">stats.i2p</a> or <a href="http://no.i2p/">no.i2p</a>.
      That is, you must enter
      your eepsite name and key into a web interface on one or more of these sites.
      Here is <a href="http://stats.i2p/i2p/addkey.html">the key entry form at stats.i2p</a>.
@@ -86,7 +86,8 @@
      to your own <a href="http://127.0.0.1:7657/susidns/subscriptions.jsp">subscription list</a>. Go to your subscriptions configuration page and add a couple of these for an automatically updated list of new hosts:<ul>
      <li><a href="http://tino.i2p/hosts.txt">http://tino.i2p/hosts.txt</a></li>
      <li><a href="http://stats.i2p/cgi-bin/newhosts.txt">http://stats.i2p/cgi-bin/newhosts.txt</a></li>
-     <li><a href="http://i2host.i2p/cgi-bin/i2hostetag">http://i2host.i2p/cgi-bin/i2hostetag</a></li></ul>
+     <li><a href="http://i2host.i2p/cgi-bin/i2hostetag">http://i2host.i2p/cgi-bin/i2hostetag</a></li>
+     <li><a href="http://no.i2p/export/alive-hosts.txt">http://no.i2p/export/alive-hosts.txt</a></li></ul>
  <li>If you are in a hurry and can't wait a few hours, you can tell people to use a "jump" address helper redirection service.
      This will work within a few minutes of your entering the key to an address book on the same site.
      Test it yourself first by entering<code>
diff --git a/installer/resources/hosts.txt b/installer/resources/hosts.txt
index 84c811a71..2071dc322 100644
--- a/installer/resources/hosts.txt
+++ b/installer/resources/hosts.txt
@@ -349,3 +349,4 @@ meeh.i2p=FA~-QarjN29hh0OzqmdwQV8HldxrjoOQUjKr6c4KQ3XZOjwiAbl7KqQgV1zGXMzWRzyZiKp
 update.dg.i2p=VF24ZkA7BpNnX5pjhhcqdQoopDX5JPLWRPidbAWXut8OMA4BGoCfGZo6hkT-WhHHOGi0OR89XqpZt6Pvf~KY-SahxNg8LD8FsWdLhaq~PXPi2H8ZGfEW7moEFm2sIlGbwQSWkFwQHmqRRvOs-YkuFFPeSRVMGzBkZGhT7~yJ9TjfpESJo~K4UEYZFp6l9BNj-kLeqEzXd4cCR8kYhubqvRGcdStNWyTPgIjZA~TffAQhR6RvLJovQbIaio8TXECFA1WE4rlX7FXlZt2DLGUhmZMEOisTS3-bH5axZID0461X8nEs~z-DuPl6CO7KFnxspWmA1gNk7Hdwcn4Jzy9bRg-2W4B2Dhh-k7wIi1lI-Tebbvpnx~cwoGjalpW95DomqcxQThQ7ffHtCIZw0GwM9ZJD-diB5zR~jDLCEr8VfiNpHuKzFb3z45QowTo4woXBU1wY0FV0cXYXrVjWz10v96bN3~v99Fp8yFJTbCNwsCf9sOl6ymqJj7l4j~xyxAouAAAA
 open4you.i2p=kvx2~4uxYZRqvfzfgT5i5JdXpk~d9HFc7l-pH4aH5yFdlSgolgW2Nekt6tVLqlpkIzzNCz90JXwTMEttqzpI~slMNCGUQLhAemW8nNIn7QUy-~dfs4myHUhopXpeTQ6~sY8hLXqIwCvSgPBGwsTl460PEfwY-pYSddBaOX4zKOSNEDPIUTbDjuIXUR-MQtILdY4O9zB8cyM9en~hcMHkEIPbKD6JKY3f2daQ4-IrowPk4-I7OKXC3Uns1oZkojjYwejHleHjozESP5lkNThWnIty0YCQp6zIJqtI-i1Yn1602d~DJoS9uUQOZJrGS89pVHX0tkHLB6LKmgKHoi--Hh6UJj47y1RMlaZwWUvY8NgTgynhBnXtMccdedRO8JklXpWiLNrOo-e4oImtLWmHYUODUia3KrnS69yLOJSSCDstLDEz0xb~J8H2cJ-U5-YyEjWiFkENbEFBzrTgvp0qHVGUYVmGZ3oPs-1l3p9C~6xG1Mx3tj-YXMloY3gH5sTiAAAA
 salt.i2p=6V5XXGZN69jV~QhveTsA4by1Ct8Q9qljltW825zuxHAsjwZWV7vngzbucllm1mDjJmE~zPq5YMho9klEgK~Ep8LIWBZ6owbB~bj5NETD2GZgGKyqN0TkwymzUFTfmqGqRxkMdTrK0poCajdTTCq5ukrmpXFz2-~twJFlQoMufaZBPcG-NqKs10c2aehUl7UbOmzr5zYHfjjtwOgf3acXnF8PRmA8tFHLD6DHA4k9YJCBVi1w6Eskeasb-sW~7DYoJc~je7xocpxJO~GziLz2fQO~2cdI5BOFmhPfOQaMhR1WFE3MRSbLEt2zNXhNlZWTCrS-Oj4c2p6qtRNRsDQvxzBZwOzRzvucB2K3WMFreY7qfS-WS5LWJxl95~DsHGwf~sqqAQF8q02gBw2Ap6kel-tijjAMXxrJw09XIQy0LbV7g1qYHG-quZRdWpEMe-LTstSmwN0C1v39QwOQhwgqYFz~OJ1HikINdf9H4Syz2HnaNDT-AOYztdUdB6z7Lwt6AAAA
+no.i2p=8jISadUQuR~kZ9YzZxfQwSQRdhY~gkTSgy4l33jKOAraoqSmb~IcoeN5xOXyhtX8gxKEb03-48zPZnso83TwcTFg66~Cu38a59fG0h~vy~WIY5x5CwfkoCFqYmo4OzdnTY-2TcQ2ZN44VA6Sx48UXjEsSdrvn0SfaeMAW5It-N6MAV23Qgc5NgRTVJ6YS74FnRZCy6uGU-RPz1HQQIH~byW-NHBmXAW2Bmv2Kq3bHVHY9tb4d8yfrhlnaf3bfhLeELUbtBnXhLd3Zs2kX6Afz7ofDkpmaygYO6XA8QNIVcM2ub6-jSdsly~EXBtRDzF0WSbT9v8rvpop5TxjwXAnTjbS09Qq8x2Bl8wfkkPz45beN0Je7wrxp0SBk5DHhhvVbbyFUS7bDn1~aTvE7Ujq8ael3myR56jb8NlYiXaiJYgwPXpXx5gSDf8rBaDIdJsSSHWv~DqOfJ1BkhADCEfGZ3QMFY7uWrXGuj0J3OYEvonV-deMoh6pYKtgcFiewJgjAAAA