diff --git a/i2p2www/pages/downloads/list.html b/i2p2www/pages/downloads/list.html
index 9b3b6377ca8b72f9cb7cf8595a9fae43aa3ae37b..0b1bfc1a40945c6d5811ef680e5e1d620addb287 100644
--- a/i2p2www/pages/downloads/list.html
+++ b/i2p2www/pages/downloads/list.html
@@ -32,23 +32,30 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 <div class="package">
   <h1>Mac OS X</h1>
   <div class="file">
-    <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s.jar')) }}">i2pinstall_{{ ver() }}.jar</a>
+    <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.3.jar') }}">i2pinstall_0.9.3.jar</a>
     <div class="sig">
       (SHA256
-8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
-      <a href="{{ url_for('downloads_select', file=ver('i2pinstall_%s.jar.sig')) }}">sig</a>)
+4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
+      <a href="{{ url_for('downloads_select', file='i2pinstall_0.9.3.jar.sig') }}">sig</a>)
     </div>
   </div>
   <div class="details">
     Download that file and double-click it (if that works) or
-    type <code>java -jar i2pinstall_{{ ver() }}.jar</code> in a terminal to run the
+    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
     installer.
-    On some platforms you may be able to right-click and select
+    You may be able to right-click and select
     &quot;Open with Java&quot;.
+    <div class="warning">
+      Due to <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+      will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
+      automatically update to 0.9.4.
+      See <a href="http://{{ i2pconv('trac.i2p2.i2p') }}/ticket/826">the ticket</a> for additional information,
+      links, and workarounds.
+    </div>
 
     <h2>Command line (headless) install:</h2>
-    Download the graphical installer file above and
-    run <code>java -jar i2pinstall_{{ ver() }}.jar -console</code> from the command line.
+    Download the 0.9.3 graphical installer file above and
+    run <code>java -jar i2pinstall_0.9.3.jar -console</code> from the command line.
   </div>
 </div>
 
diff --git a/i2p2www/pages/site/docs/api/samv3.html b/i2p2www/pages/site/docs/api/samv3.html
index 30d15103b30214b769d634e5922187f392dc7347..81db268f61c7addb6e422d04c6b70efb199c4adf 100644
--- a/i2p2www/pages/site/docs/api/samv3.html
+++ b/i2p2www/pages/site/docs/api/samv3.html
@@ -182,18 +182,18 @@ A client asks for a connection by :
 -&gt; STREAM CONNECT
          ID={$nickname}
          DESTINATION=$peer_public_base64_key
-         [SILENCE={true,false}]
+         [SILENT={true,false}]
 
 This establishes a new virtual connection from the local session
 whose ID is {$nickname} to the specified peer.
 
-If SILENCE=true is passed, the SAM bridge won't issue any other message
+If SILENT=true is passed, the SAM bridge won't issue any other message
 on the socket : if the connection fails, the socket will be closed.
 If the connection succeeds, all remaining data passing through the
 current socket is forwarded from and to the connected I2P destination
 peer.
 
-If SILENCE=false, which is the default value, the SAM bridge sends a
+If SILENT=false, which is the default value, the SAM bridge sends a
 last message to its client before forwarding or shutting down the
 socket :
 
@@ -228,7 +228,7 @@ A client waits for an incoming connection request by :
 
 -&gt; STREAM ACCEPT
          ID={$nickname}
-         [SILENCE={true,false}]
+         [SILENT={true,false}]
 
 This makes the session ${nickname} listen for one incoming
 connection request from the I2P network.
@@ -250,11 +250,11 @@ bridge. If the result is OK, the SAM bridge starts waiting for an
 incoming connection request from another I2P peer. When a request
 arrives, the SAM bridge accepts it and :
 
- * If SILENCE=true was passed, the SAM bridge won't issue any other message
+ * If SILENT=true was passed, the SAM bridge won't issue any other message
 on the client socket : all remaining data passing through the
 current socket is forwarded from and to the connected I2P destination
 peer.
- * If SILENCE=false was passed, which is the default value, the SAM bridge
+ * If SILENT=false was passed, which is the default value, the SAM bridge
 sends the client a ASCII line containing the base64 public destination key
 of the requesting peer. After this '\n' terminated line, all remaining data 
 passing through the current socket is forwarded from and to the connected
@@ -274,7 +274,7 @@ coming from I2P. For that, the client has to :
          ID={$nickname}
          PORT={$port}
          [HOST={$host}]
-         [SILENCE={true,false}]
+         [SILENT={true,false}]
 
 This makes the session ${nickname} listen for incoming
 connection requests from the I2P network.
@@ -302,10 +302,10 @@ When a connection request arrives from I2P, the SAM bridge requests a
 socket connection from {$host}:{$port}. If it is accepted after no more
 than 3 seconds, SAM will accept the connection from I2P, and then :
 
- * If SILENCE=true was passed, all data passing through the obtained
+ * If SILENT=true was passed, all data passing through the obtained
 current socket is forwarded from and to the connected I2P destination
 peer.
- * If SILENCE=false was passed, which is the default value, the SAM bridge
+ * If SILENT=false was passed, which is the default value, the SAM bridge
 sends on the obtained socket an ASCII line containing the base64 public
 destination key of the requesting peer. After this '\n' terminated line,
 all remaining data passing through the socket is forwarded from and to 
diff --git a/i2p2www/pages/site/docs/spec/common_structures.html b/i2p2www/pages/site/docs/spec/common_structures.html
index 805cc76d6a47648ebb337115c84f6348e238396a..ed8c102e523bc1dd2d21878b03c31b5f6c079a84 100644
--- a/i2p2www/pages/site/docs/spec/common_structures.html
+++ b/i2p2www/pages/site/docs/spec/common_structures.html
@@ -503,7 +503,7 @@ signing_key :: SigningPublicKey
 
 num :: Integer
        length -> 1 byte
-       value: 0 <= num <= 6
+       value: 0 <= num <= 16
 
 leases :: [Lease]
           length -> >= $num*44 bytes
diff --git a/i2p2www/pages/site/docs/spec/i2cp.html b/i2p2www/pages/site/docs/spec/i2cp.html
index c336e76013ae62294e876ab5f76b9b7ab30cf0a6..6fd54e76ecc22a66186b3a19aed1b0c1357bfbfc 100644
--- a/i2p2www/pages/site/docs/spec/i2cp.html
+++ b/i2p2www/pages/site/docs/spec/i2cp.html
@@ -261,6 +261,8 @@ time.
 
 
 <h2 id="messages">Messages</h2>
+See also the
+<a href="http://docs.i2p-projekt.de/javadoc/net/i2p/data/i2cp/package-summary.html">I2CP Javadocs</a>.
 <h3 id="types">Message Types</h3>
 <table border=1>
 <tr><th>Message<th>Direction<th>Type
@@ -661,12 +663,17 @@ For an outgoing message, this is a response to a
 
 <h4>Notes</h4>
 <p>
-The known status values are 0 for message is available, 1 for accepted, 2 for best
+Through version 0.9.4,
+the known status values are 0 for message is available, 1 for accepted, 2 for best
 effort succeeded, 3 for best effort failed, 4 for guaranteed succeeded, 5 for
 guaranteed failed. The size Integer specifies the size of the available
 message and is only relevant for status = 0.
 Even though guaranteed is unimplemented, (best effort is the only service), the current
 router implementation uses the guaranteed status codes, not the best effort codes.
+As of router version 0.9.5, additional status codes are defined.
+See the
+<a href="http://docs.i2p-projekt.de/javadoc/net/i2p/data/i2cp/MessageStatusMessage.html">MessageStatusMessage Javadocs</a>
+for details.
 </p>
 <p>
 When status = 1 (accepted), the nonce matches the nonce in the
diff --git a/www.i2p2/pages/translations/download_ar.html b/www.i2p2/pages/translations/download_ar.html
index fb6ef331add433ff245fe6e8d1c385451eebff21..17f41f0538a69c7a57156089b6bbf0d41f1fd601 100644
--- a/www.i2p2/pages/translations/download_ar.html
+++ b/www.i2p2/pages/translations/download_ar.html
@@ -20,7 +20,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     <a href="http://mirror.i2p2.de/i2pinstall_0.9.4_windows.exe.sig">sig</a>)
 </li>
   
-<li><b>Linux / OS X / BSD / Solaris</b> التثبيت عن طريق الواجهة الرسومية :<br />
+<li><b>Linux / BSD / Solaris</b> التثبيت عن طريق الواجهة الرسومية :<br />
     <a href="http://mirror.i2p2.de/i2pinstall_0.9.4.jar">i2pinstall_0.9.4.jar</a>
     (SHA256
 8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
@@ -34,7 +34,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
      <code>java -jar i2pinstall_0.9.4.jar</code></li>
 
 
-<li><b>Linux / OS X / BSD / Solaris</b> التثبيت عن طريق سطر الأوامر :<br />
+<li><b>Linux / BSD / Solaris</b> التثبيت عن طريق سطر الأوامر :<br />
     حمل ملف التثبيت عن طريق الواجهة الرسومية المذكور مسبقاً ثمّ نفذ الأمر
     <code>java -jar i2pinstall_0.9.4.jar -console</code> في سطر الأوامر لديك
     هذا ينطبق على أنظمة ويندوز و لينكس و ما كنتوش (نعم ،حقاً !) 
@@ -42,6 +42,32 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
 
 <li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>
 
+<li><b>OS X Graphical installer:</b><br />
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
+    automatically update to 0.9.4.
+    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
+    links, and workarounds.
+    <br>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    (SHA256
+4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+    Download that file and double-click it (if that works) or
+    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
+    installer.
+    You may be able to right-click and select
+    &quot;Open with Java&quot;
+  حمل الملف و نفّذه ،و اذا كان نظام التشغيل لديك غير ويندوز نفّذ الأمر التالي 
+     <code>java -jar i2pinstall_0.9.3.jar</code></li>.
+</li>
+
+<li><b>OS X</b> التثبيت عن طريق سطر الأوامر :<br />
+    حمل ملف التثبيت عن طريق الواجهة الرسومية المذكور مسبقاً ثمّ نفذ الأمر
+    <code>java -jar i2pinstall_0.9.3.jar -console</code> في سطر الأوامر لديك
+    هذا ينطبق على أنظمة ويندوز و لينكس و ما كنتوش (نعم ،حقاً !) 
+</li>
+
 <li>تحميل النص المصدري :<br />
     <a href="http://mirror.i2p2.de/i2psource_0.9.4.tar.bz2">i2psource_0.9.4.tar.bz2</a>
     (SHA256
diff --git a/www.i2p2/pages/translations/download_cs.html b/www.i2p2/pages/translations/download_cs.html
index 28d68268f29daeafce7d43883fb4d46c7d4fa2db..dbdb9870a98df016f36c0912ad4c447488b28589 100644
--- a/www.i2p2/pages/translations/download_cs.html
+++ b/www.i2p2/pages/translations/download_cs.html
@@ -17,7 +17,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     Pod Windows: stáhněte soubor a spusťte ho.
 </li>
 
-<li><b>Linux / OS X / BSD / Solaris Grafický instalační program:</b><br />
+<li><b>Linux / BSD / Solaris Grafický instalační program:</b><br />
     <a href="http://mirror.i2p2.de/i2pinstall_0.9.4.jar">i2pinstall_0.9.4.jar</a>
     (SHA256
 8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
@@ -28,12 +28,34 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     On some platforms you may be able to right-click and select
     &quot;Open with Java&quot;.</li>
 
-<li><b>Linux / OS X / BSD / Solaris Instalace z příkazové řádky:</b><br />
+<li><b>Linux / BSD / Solaris Instalace z příkazové řádky:</b><br />
     Stáhněte si grafický instalační program (viz výše) a spusťte ho příkazem <code>java -jar i2pinstall_0.9.4.jar -console</code>
 </li>
 
 <li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>
 
+<li><b>OS X Graphical installer:</b><br />
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
+    automatically update to 0.9.4.
+    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
+    links, and workarounds.
+    <br>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    (SHA256
+4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+    Download that file and double-click it (if that works) or
+    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
+    installer.
+    You may be able to right-click and select
+    &quot;Open with Java&quot;.
+</li>
+
+<li><b>OS X Instalace z příkazové řádky:</b><br />
+    Stáhněte si grafický instalační program (viz výše) a spusťte ho příkazem <code>java -jar i2pinstall_0.9.3.jar -console</code>
+</li>
+
 <li><b>Instalace ze zdrojového kódu:</b><br />
     <a href="http://mirror.i2p2.de/i2psource_0.9.4.tar.bz2">i2psource_0.9.4.tar.bz2</a>
     (SHA256
diff --git a/www.i2p2/pages/translations/download_de.html b/www.i2p2/pages/translations/download_de.html
index 9ad60df75bfa1477b3ac35167438a212e6b665da..7d1d537597cebb3831ba0c551fe4d34596d58725 100644
--- a/www.i2p2/pages/translations/download_de.html
+++ b/www.i2p2/pages/translations/download_de.html
@@ -20,7 +20,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
      <a href="http://mirror.i2p2.de/i2pinstall_0.9.4_windows.exe.sig">sig</a>)<br /> 
     Downloade die Datei und f&uuml;hre sie aus. </li>
 
-<li><b>Linux / OS X / BSD / Solaris GUI Installer:</b><br />
+<li><b>Linux / BSD / Solaris GUI Installer:</b><br />
     <a href="http://mirror.i2p2.de/i2pinstall_0.9.4.jar">i2pinstall_0.9.4.jar</a>
     (SHA256
 8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
@@ -31,13 +31,36 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     Auf einigen Plattformen muss die Datei gegebenfall mit Rechts-Klick und der 
     Option "&Ouml;ffne mit Java" ge&ouml;ffnet werden.</li>
 
-<li><b>Linux / OS X / BSD / Solaris Kommandozeilen (Headless) Installation:</b><br />
+<li><b>Linux / BSD / Solaris Kommandozeilen (Headless) Installation:</b><br />
     Downloade die normale Installationsdatei von oben und rufe
     <code>java -jar i2pinstall_0.9.4.jar -console</code> in der Kommandozeile auf.
 </li>
 
 <li><a href="/debian.html">Pakete f&uuml;r Debian &amp; Ubuntu</a></li>
 
+<li><b>OS X Graphical installer:</b><br />
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
+    automatically update to 0.9.4.
+    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
+    links, and workarounds.
+    <br>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    (SHA256
+4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+    Hole die Datei und f&uuml;hre sie mit Doppelklick aus (falls es funktioniert)
+    oder gebe <code>java -jar i2pinstall_0.9.3.jar</code> in einm Terminal ein um
+    die Installation zu starten.
+    Auf einigen Plattformen muss die Datei gegebenfall mit Rechts-Klick und der 
+    Option "&Ouml;ffne mit Java" ge&ouml;ffnet werden.
+</li>
+
+<li><b>OS X Kommandozeilen (Headless) Installation:</b><br />
+    Downloade die normale Installationsdatei von oben und rufe
+    <code>java -jar i2pinstall_0.9.3.jar -console</code> in der Kommandozeile auf.
+</li>
+
 <li><b>Quelltext Installation:</b><br />
     <a href="http://mirror.i2p2.de/i2psource_0.9.4.tar.bz2">i2psource_0.9.4.tar.bz2</a>
     (SHA256
diff --git a/www.i2p2/pages/translations/download_el.html b/www.i2p2/pages/translations/download_el.html
index a78ad69e2981262a82c23f1ea44353ab34c5387d..be1af9005a027027a824354e00a1a0636e8d3c3a 100644
--- a/www.i2p2/pages/translations/download_el.html
+++ b/www.i2p2/pages/translations/download_el.html
@@ -21,7 +21,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     Κατεβάστε αυτό το αρχείο και εκτελέστε το.
 </li>
 
-<li><b>Εγκατάσταση με γραφικό περιβάλλον για Linux / OS X / BSD / Solaris:</b><br />
+<li><b>Εγκατάσταση με γραφικό περιβάλλον για Linux / BSD / Solaris:</b><br />
     <a href="http://mirror.i2p2.de/i2pinstall_0.9.4.jar">i2pinstall_0.9.4.jar</a>
     (SHA256
 8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
@@ -32,12 +32,35 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     Σε μερικές πλατφόρμες μπορείτε να κάνετε δεξιό "κλικ" και να επιλέξετε
     &quot;Open with Java&quot;.</li>
 
-<li><b>Εγκατάσταση από γραμμή εντολών (headless) για Linux / OS X / BSD / Solaris:</b><br />
+<li><b>Εγκατάσταση από γραμμή εντολών (headless) για Linux / BSD / Solaris:</b><br />
     Κατεβάστε την εγκατάσταση με γραφικό περιβάλλον από παραπάνω και εκτελέστε
     <code>java -jar i2pinstall_0.9.4.jar -console</code> στη γραμμή εντολών.
 </li>
 
-    <li><a href="/debian.html">Πακέτα για Debian &amp; Ubuntu</a></li>
+<li><a href="/debian.html">Πακέτα για Debian &amp; Ubuntu</a></li>
+
+<li><b>OS X Graphical installer:</b><br />
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
+    automatically update to 0.9.4.
+    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
+    links, and workarounds.
+    <br>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    (SHA256
+4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+    Κατεβάστε αυτό το αρχείο και κάντε διπλό "κλικ" (εάν δουλεύει) ή
+    πληκτρολογήστε <code>java -jar i2pinstall_0.9.3.jar</code> στη γραμμή εντολών
+    για να τρέξετε την εγκατάσταση.
+    Σε μερικές πλατφόρμες μπορείτε να κάνετε δεξιό "κλικ" και να επιλέξετε
+    &quot;Open with Java&quot;.
+</li>
+
+<li><b>Εγκατάσταση από γραμμή εντολών (headless) για OS X:</b><br />
+    Κατεβάστε την εγκατάσταση με γραφικό περιβάλλον από παραπάνω και εκτελέστε
+    <code>java -jar i2pinstall_0.9.3.jar -console</code> στη γραμμή εντολών.
+</li>
 
 <li><b>Εγκατάσταση από πηγαίο κώδικα:</b><br />
     <a href="http://mirror.i2p2.de/i2psource_0.9.4.tar.bz2">i2psource_0.9.4.tar.bz2</a>
diff --git a/www.i2p2/pages/translations/download_es.html b/www.i2p2/pages/translations/download_es.html
index 923d3157a4258932140ed4d2096c2ab1025ed9b2..964eacb39de3fe984ac8c03c97bc4d879a5f94eb 100644
--- a/www.i2p2/pages/translations/download_es.html
+++ b/www.i2p2/pages/translations/download_es.html
@@ -20,7 +20,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     <a href="http://mirror.i2p2.de/i2pinstall_0.9.4_windows.exe.sig">sig</a>)
 </li>
 
-<li><b>Linux / OS X / BSD / Solaris Instalador gráfico:</b><br />
+<li><b>Linux / BSD / Solaris Instalador gráfico:</b><br />
   <a href="http://mirror.i2p2.de/i2pinstall_0.9.4.jar">i2pinstall_0.9.4.jar</a>
     (SHA256
 8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
@@ -31,13 +31,36 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     On some platforms you may be able to right-click and select
     &quot;Open with Java&quot;.</li>
 
-<li><b>Linux / OS X / BSD / Solaris Instalación desde la línea de comandos (headless):</b><br />
+<li><b>Linux / BSD / Solaris Instalación desde la línea de comandos (headless):</b><br />
     Descarga el archivo del instalador gráfico  y
     arranca <code>java -jar i2pinstall_0.9.4.jar -console</code> desde la línea de comandos.
 </li>
 
 <li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>
 
+<li><b>OS X Graphical installer:</b><br />
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
+    automatically update to 0.9.4.
+    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
+    links, and workarounds.
+    <br>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    (SHA256
+4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+    Download that file and double-click it (if that works) or
+    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
+    installer.
+    You may be able to right-click and select
+    &quot;Open with Java&quot;.
+</li>
+
+<li><b>OS X Instalación desde la línea de comandos (headless):</b><br />
+    Descarga el archivo del instalador gráfico  y
+    arranca <code>java -jar i2pinstall_0.9.3.jar -console</code> desde la línea de comandos.
+</li>
+
 <li><b>Instalación desde el código fuente:</b><br />
     <a href="http://mirror.i2p2.de/i2psource_0.9.4.tar.bz2">i2psource_0.9.4.tar.bz2</a>
     (SHA256
diff --git a/www.i2p2/pages/translations/download_fr.html b/www.i2p2/pages/translations/download_fr.html
index 457e621eea667b635507a187fd829cd8e7409393..5f2efd74f33abc4999c6619a6e5514e77ee9e8e4 100644
--- a/www.i2p2/pages/translations/download_fr.html
+++ b/www.i2p2/pages/translations/download_fr.html
@@ -21,7 +21,7 @@ ou tapez <tt>java -version</tt> à l'invite de commande.
     Téléchargez ce fichier et exécutez-le.  
 </li>
 
-<li><b>Linux / OS X / BSD / Solaris Installeur graphique:</b><br />
+<li><b>Linux / BSD / Solaris Installeur graphique:</b><br />
     <a href="http://mirror.i2p2.de/i2pinstall_0.9.4.jar">i2pinstall_0.9.4.jar</a>
     (SHA256 
 8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
@@ -31,13 +31,34 @@ ou tapez <tt>java -version</tt> à l'invite de commande.
     taper <code>java -jar i2pinstall_0.9.4.jar</code>
 </li>
 
-<li><b>Linux / OS X / BSD / Solaris  Installation en ligne de commande (facile):</b><br />
+<li><b>Linux / BSD / Solaris  Installation en ligne de commande (facile):</b><br />
     Téléchargez le fichier de l'installeur graphique ci-dessus et
     exécutez <code>java -jar i2pinstall_0.9.4.jar -console</code> sur la ligne de commande.
 </li>
 
 <li><a href="/debian_fr.html">Packages for Debian &amp; Ubuntu</a></li>
 
+<li><b>OS X Graphical installer:</b><br />
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
+    automatically update to 0.9.4.
+    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
+    links, and workarounds.
+    <br>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    (SHA256
+4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+    Téléchargez ce fichier et exécutez-le.  
+    Vous pouvez 
+    taper <code>java -jar i2pinstall_0.9.3.jar</code>
+</li>
+
+<li><b>OS X Installation en ligne de commande (facile):</b><br />
+    Téléchargez le fichier de l'installeur graphique ci-dessus et
+    exécutez <code>java -jar i2pinstall_0.9.3.jar -console</code> sur la ligne de commande.
+</li>
+
 <li><b>À partir des sources:</b><br />
     <a href="http://mirror.i2p2.de/i2psource_0.9.4.tar.bz2">i2psource_0.9.4.tar.bz2</a>
     (SHA256 1b7d9695555ed42142b04ad6bcda083cd1a064f6354b639ad2aef4d9cd474e06
diff --git a/www.i2p2/pages/translations/download_ru.html b/www.i2p2/pages/translations/download_ru.html
index b5720d112456c39cfc46c2874cd261b290dc00d7..b0f9e9eb89f1318634da2fa2a0bd29acafa6ae75 100644
--- a/www.i2p2/pages/translations/download_ru.html
+++ b/www.i2p2/pages/translations/download_ru.html
@@ -22,7 +22,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     Под Windows: скачайте этот файл и запустите его. 
 </li>
 
-<li><b>Графический инсталлятор для Linux / OS X / BSD / Solaris:</b><br />
+<li><b>Графический инсталлятор для Linux / BSD / Solaris:</b><br />
     <a href="http://mirror.i2p2.de/i2pinstall_0.9.4.jar">i2pinstall_0.9.4.jar</a>
     (SHA256
 8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
@@ -33,13 +33,35 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
     &quot;Open with Java&quot;.
 </li> 
 
-<li><b>Установка из командной строки в Linux / OS X / BSD / Solaris:</b><br /> 
+<li><b>Установка из командной строки в Linux / BSD / Solaris:</b><br /> 
 
 Скачайте графический инсталлятор по ссылке выше и запустите из командной строки <code>java -jar i2pinstall_0.9.4.jar -console</code> <br /> 
 </li>
 
 <li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>
 
+<li><b>OS X Graphical installer:</b><br />
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
+    automatically update to 0.9.4.
+    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
+    links, and workarounds.
+    <br>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    (SHA256
+4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+    Скачайте этот файл и запустите двойным кликом, или выполните в консоли
+    команду <code>java -jar i2pinstall_0.9.3.jar</code> для запуска инсталлятора.
+    На некоторых платформах вы можете вызвать контекстное меню и выбрать
+    &quot;Open with Java&quot;.
+</li>
+
+<li><b>Установка из командной строки в OS X:</b><br /> 
+
+Скачайте графический инсталлятор по ссылке выше и запустите из командной строки <code>java -jar i2pinstall_0.9.3.jar -console</code> <br /> 
+</li>
+
 <li><b>Установка из исходного кода:</b><br />
     <a href="http://mirror.i2p2.de/i2psource_0.9.4.tar.bz2">i2psource_0.9.4.tar.bz2</a>
     (SHA256 
diff --git a/www.i2p2/pages/translations/download_zh.html b/www.i2p2/pages/translations/download_zh.html
index e388bf8ff03067d3f2fc6b5157b587a2e26dffae..48464e4993719c4270460f15315e5e5768a1119f 100644
--- a/www.i2p2/pages/translations/download_zh.html
+++ b/www.i2p2/pages/translations/download_zh.html
@@ -17,7 +17,7 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
    <a href="http://mirror.i2p2.de/i2pinstall_0.9.4_windows.exe.sig">sig</a>)
 </li>
 
-<li><b>Linux / OS X / BSD / Solaris</b> 图形安装程序:<br />
+<li><b>Linux / BSD / Solaris</b> 图形安装程序:<br />
     <a href="http://mirror.i2p2.de/i2pinstall_0.9.4.jar">i2pinstall_0.9.4.jar</a>
     (SHA256
 8e670ba26c04176ace9246d91a09951975e2965b89628f620f5a3dff917298e4
@@ -30,12 +30,35 @@ c76bea15a6b7d98227466cc8025b1eb9069997e40e9d71ff49e55b2c8ac0b995
    <br />下载以上文件并运行如果你不是 windows 用户，可以输入 <code>java -jar i2pinstall_0.9.4.jar</code>
 </li>
 
-<li><b>Linux / OS X / BSD / Solaris</b> 命令行安装(即无头安装):<br />
+<li><b>Linux / BSD / Solaris</b> 命令行安装(即无头安装):<br />
    下载上面的图形安装程序并在命令行状态下运行 <code>java -jar i2pinstall_0.9.4.jar -console</code>。
 </li>
 
 <li><a href="/debian.html">Packages for Debian &amp; Ubuntu</a></li>
 
+<li><b>OS X Graphical installer:</b><br />
+    Due to <a href="http://trac.i2p2.de/ticket/826">a wrapper bug</a>, the 0.9.4 installer
+    will <b>NOT</b> work on OS X. Use the 0.9.3 installer. After I2P starts, it will
+    automatically update to 0.9.4.
+    See <a href="http://trac.i2p2.de/ticket/826">the ticket</a> for additional information,
+    links, and workarounds.
+    <br>
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar">i2pinstall_0.9.3.jar</a>
+    (SHA256
+4ebea74b30064c9853c40cf24764d283dc6fff47ed2449b247f3c9991cccb494
+    <a href="http://mirror.i2p2.de/i2pinstall_0.9.3.jar.sig">sig</a>)<br />
+    Download that file and double-click it (if that works) or
+    type <code>java -jar i2pinstall_0.9.3.jar</code> in a terminal to run the
+    installer.
+    On some platforms you may be able to right-click and select
+    &quot;Open with Java&quot;.
+   <br />下载以上文件并运行如果你不是 windows 用户，可以输入 <code>java -jar i2pinstall_0.9.3.jar</code>
+</li>
+
+<li><b>OS X</b> 命令行安装(即无头安装):<br />
+   下载上面的图形安装程序并在命令行状态下运行 <code>java -jar i2pinstall_0.9.3.jar -console</code>。
+</li>
+
 <li>用源码安装:<br />
    <a href="http://mirror.i2p2.de/i2psource_0.9.4.tar.bz2">i2psource_0.9.4.tar.bz2</a>
     <br/>(SHA256