diff --git a/docs/chapters/firmware.xml b/docs/chapters/firmware.xml
index 96d4e5a..eb93fb4 100644
--- a/docs/chapters/firmware.xml
+++ b/docs/chapters/firmware.xml
@@ -76,16 +76,13 @@ $ cd ../..
             </imageobject>
         </figure>
 
-        <note><title>v1.0p Hardware Owners</title>
+        <note><title>v1.0p/v1.1p Hardware Owners</title>
             <para>Sometimes the SAM-BA mode is not entered. This is the case when the
             two LEDs are on when powering up the SIMtrace Hardware with the Jumper set.
             The reason for this is unknown but there are several workarounds:
             <itemizedlist>
                 <listitem>Press the RESET button while powering up.</listitem>
-                <listitem>Touch PA0 (pin 48, on the right upper corner)
-                with a piece of metal.</listitem>
-                <listitem>Short PA0 and PA1 (pin 48 and 47, next to each other on
-                the right upper corner).</listitem>
+                <listitem>In addition, remove the jumper and put it back.</listitem>
             </itemizedlist>
 
             As soon as the two LEDs go off, the SAM-BA mode is properly entered.
@@ -119,7 +116,21 @@ $ ./sam7 --exec set_clock --exec unlock_regions --exec "flash ../openpcd/firmwar
         <ulink url="http://dfu-util.gnumonks.org/">dfu-util.gnumonks.org</ulink>
         website. To update the main part of the firmware simply do:
         <screen>
-$ $ dfu-util -d 16c0:0762 -a0 -D ./main_simtrace.bin -R
+$ dfu-util -d 16c0:0762 -a0 -D ./main_simtrace.bin -R
         </screen></para>
     </section>
+
+    <section id="firmware_programming_upgrade">
+        <title>Upgrading to v0.4 Firmware</title>
+        <para>Upgrading to v0.4 requires flashing both the Bootloader and the
+        SIMtrace application. The procedure is first to flash the bootloader,
+        then the SIMtrace application and finally reset the device.
+        </para>
+
+        <screen>
+$ dfu-util -d 16c0:0762 -a 1  -D ./dfu.bin
+$ dfu-util -d 16c0:0762 -a 0  -D ./main_simtrace.bin
+... reset the device
+        </screen>
+    </section>
 </chapter>
diff --git a/docs/chapters/using_sniff.xml b/docs/chapters/using_sniff.xml
index 63f0419..1a8c2a0 100644
--- a/docs/chapters/using_sniff.xml
+++ b/docs/chapters/using_sniff.xml
@@ -51,17 +51,9 @@ simtrace - GSM SIM and smartcard tracing
 
     <section id="known_firmware_issues">
         <title>Known Firmware Issues</title>
-        <para>The current firmware has two known bugs that limit the usage
-        of the device. There is a problem with the enumeration on USB 3.0
-        controllers and the second is related to enumeration on OS X (Lion).
-        </para>
-
-        <para>The firmware does not properly enumerate on systems with USB 3.0
-        controllers. The issue has not been analyzed and the workaround is to
-        use a USB &lt; 3.0 port or put a USB &lt; 3.0 hub between.</para>
-
-        <para>The firmware sends a wrong Zero Length Packet as a response to a
-        GET_DESCRIPTION request. OSX handles this by resetting the device.</para>
+        <para>For some SIM Cards the ATR and the first APDU are sent in the
+        same USB message and the host utility fails to split the APDUs
+        properly. A band-aid for the firmware exists.</para>
     </section>
 
     <section id="other_modes">
diff --git a/docs/usermanual.xml b/docs/usermanual.xml
index 3c85255..59d4078 100644
--- a/docs/usermanual.xml
+++ b/docs/usermanual.xml
@@ -41,12 +41,19 @@
             <authorinitials>z</authorinitials>
             <revremark>Document Firmware</revremark>
         </revision>
+        <revision>
+            <revnumber>0.0.5</revnumber>
+            <date>10 January 2012</date>
+            <authorinitials>z</authorinitials>
+            <revremark>Add additional distro packages, mention the v0.4 firmware
+            update procedure, add some notes of the SAM-BA mode</revremark>
+        </revision>
     </revhistory>
 
     <title>SIMtrace Usermanual</title>
 
     <copyright>
-      <year>2011</year>
+      <year>2011-2012</year>
     </copyright>
 
     <legalnotice>