diff --git a/README.txt b/README.txt
index f1b9b1fa2f76fbb85cb91b060d829b8b55bd600b..52452829da8d69b791bfdc9633596001295e93d7 100644
--- a/README.txt
+++ b/README.txt
@@ -4,8 +4,6 @@ SDK Platform-tools Version 5, June 2011.
 
 The i2p source must be installed in ../i2p.i2p,
 or else add i2psrc=/path/to/source in the local.properties file.
-Temporary - requires changes in the i2p.i2p.zzz.android branch,
-use it instead!
 
 =====================
 
diff --git a/res/raw/releasenotes_txt b/res/raw/releasenotes_txt
index cc552e84a608681b5762910d48e58f8ae82324b1..f49fa26f4b9034da356da5adfcc1153de86e523c 100644
--- a/res/raw/releasenotes_txt
+++ b/res/raw/releasenotes_txt
@@ -27,15 +27,13 @@ Embedded web browser
 The browser does not use the outproxy for regular web sites. Javascript is disabled.
 
 The following problems with eepsites are probably not fixable except on Android 3.0 (Honeycomb - i.e. tablets) due to API limitations. I don't have a tablet to test on, so I haven't made any effort to work on it. The workaround is to use Firefox Mobile 4 and the ProxMob plugin (see below).
-  - No images
-  - No CSS
   - No POSTs to forms
 
 For eepsites, there are several other things to note:
   - No cookies
   - No way to type in addresses
-  - Eepsites are not found in the cache when hitting the back button
-  - Fetches are aborted when you rotate the screen
+  - Several issues with images and CSS fetches
+  - Non-HTML links (pdf, text, images, torrent, etc.) probably don't work
 
 
 Using clients with the router
diff --git a/res/raw/router_config b/res/raw/router_config
index cd1015180bf389218fa1ec9f733d0050bef4c94e..1dfdd356e47b2e8cd51f2f7d0a18b7fdacb69e01 100644
--- a/res/raw/router_config
+++ b/res/raw/router_config
@@ -16,6 +16,11 @@ time.disabled=true
 #
 i2cp.disableInterface=true
 #
+# hosts.txt should be more crash-proof than blockfile
+# Todo: implement a NamingService using the android native SQLite
+#
+i2p.naming.impl=net.i2p.client.naming.HostsTxtNamingService
+#
 ##### Tunnels
 #
 router.inboundPool.backupQuantity=0