diff --git a/lib/haxe/README.md b/lib/haxe/README.md
index 51f3dbb..fd4debe 100644
--- a/lib/haxe/README.md
+++ b/lib/haxe/README.md
@@ -23,24 +23,60 @@
 Using Thrift with Haxe
 ========================
 
+Haxe setup
+---------------
+
 Thrift requires Haxe 3.1.3. Installers for Windows and OSX
 platforms are available at `http://haxe.org/download`. 
 
+Depending on the desired targets, you may have to install the appropriate HaxeLibs 
+after installing Haxe itself. For example, if you plan to target C#, Java and C++,
+enter the following commands after installing Haxe:
+
+    haxelib install hxcpp
+    haxelib install hxjava
+    haxelib install hxcs
+
+For other targets, please consult the Haxe documentation whether or not any additional
+target libraries need to be installed and how to achieve this.
+
+
+Haxe on Linux 
+---------------
+
 For Linux platforms it is recommended not to download the 
 binaries manually, instead use the Haxe installation shell 
 script which can be found at `http://www.openfl.org/download`.
 
+If you run into the error message 
+
+    Uncaught exception - load.c(237) : Failed to load library : /usr/lib/neko/regexp.ndll  
+	(libpcre.so.3: cannot open shared object file: No such file or directory)
+
+this can be solved depending on your OSes bitness by either
+
+    sudo ln -sf /usr/lib/libpcre.so.1 /usr/lib/libpcre.so.3
+    sudo ldconfig
+	
+or
+
+    sudo ln -sf /usr/lib64/libpcre.so.1 /usr/lib64/libpcre.so.3
+    sudo ldconfig
+
+Thrift Haxe bindings
+-------------------
+	
 Thrift Haxe bindings can be set up via the `haxelib` tool  
 either from the official ASF repo, or via the github mirror.
 
 - To set up any **stable version**, choose the appropriate branch (e.g. `0.9.3`):
 
-    - `haxelib git thrift https://git-wip-us.apache.org/repos/asf/thrift.git 0.9.3 lib/haxe`
+    - `haxelib git thrift https://git.apache.org/thrift.git 0.9.3 lib/haxe`
     - `haxelib git thrift https://github.com/apache/thrift.git 0.9.3 lib/haxe`
 
 - To set up the current **development version**, use the `master` branch:
   
-    - `haxelib git thrift https://git-wip-us.apache.org/repos/asf/thrift.git master lib/haxe`	
+    - `haxelib git thrift https://git.apache.org/thrift.git master lib/haxe`	
     - `haxelib git thrift https://github.com/apache/thrift.git master lib/haxe`
 
 As usual, the installed library can be updated using `haxelib upgrade` 
@@ -59,7 +95,7 @@
 ========================
 - tested with Haxe C++ target
 - transports: Socket, HTTP (client only), Stream
-- protocols: Binary, JSON, Multiplex
+- protocols: Binary, JSON, Multiplex, Compact
 - tutorial client and server available
 - cross-test client and server available 
 
@@ -71,25 +107,6 @@
 - add HTTP server, update tutorial and tests accordingly
 
 
-Dependencies
-========================
-
-Haxe Targets:
-Depending on the desired targets, you may have to install the appropriate HaxeLibs 
-after installing Haxe itself. For example, if you plan to target C#, Java and C++,
-enter the following commands after installing Haxe:
-
-    haxelib install hxcpp
-    haxelib install hxjava
-    haxelib install hxcs
-
-For other targets, please consult the Haxe documentation whether or not any additional
-target libraries need to be installed and how to achieve this.
- 
-Haxe Libraries:
-- None (at the time of writing)
-
-
 Known restrictions
 ========================