diff --git a/Documentation/options.txt b/Documentation/options.txt
index d1a89f3a..03f4c0b8 100644
--- a/Documentation/options.txt
+++ b/Documentation/options.txt
@@ -12,6 +12,9 @@ Jato supports the following command line options:
     -Xtrace:asm
       Trace the emitted machine code for each method.
 
+    -Xtracte:bytecode
+      Trace the emitted bytecode for each method
+
     -Xtrace:classloader
       Trace class loading and initialization.
 
@@ -19,4 +22,11 @@ Jato supports the following command line options:
       Trace executed trampolines.
 
     -Xdebug:stack
-      Enable stack smashing debugging.
+      Enables stack smashing debugging.
+
+    -Xperf
+      Enables linux perf support by outputting perf-<pid>.map files in /tmp
+
+    -Xmaps
+      prints the list of loaded object files
+
diff --git a/README.md b/README.md
index 53f8cc4a..89040786 100644
--- a/README.md
+++ b/README.md
@@ -54,13 +54,14 @@ $ sudo yum install java-1.7.0-openjdk antlr GConf2-devel gtk2-devel gettext-deve
 $ sudo apt-get install openjdk-6-jdk antlr libgconf2-dev libgtk2.0-dev ecj fastjar pccts
 ```
 
-Then download the sources from:
+Then clone the sources from the git repository (the release 0.99 appears to be broken)
 
-  ftp://ftp.gnu.org/pub/gnu/classpath/classpath-0.99.tar.gz
+  git clone git://git.savannah.gnu.org/classpath.git
 
 You can then compile GNU Classpath:
 
 ```
+$ ./autogen.sh
 $ ./configure --disable-Werror --disable-plugin
 $ make
 ```