--- a/INSTALL	Fri Aug 29 13:09:40 2014 +0200
+++ b/INSTALL	Fri Aug 29 13:10:11 2014 +0200
@@ -62,19 +62,24 @@
     make && make test && make install
 
 Libcurl:
-    wget http://curl.haxx.se/download/curl-7.37.1.tar.{gz,gz.asc}
-    gpg2 --verify curl-7.37.1.tar.gz.asc
+    wget http://curl.haxx.se/download/curl-7.37.1.tar.gz
+    a32492a38c10a097344892f5fd2041e54698cb909696852311b1161e4aa979f3 curl-7.37.1.tar.gz
+
     tar -xf curl-7.37.1.tar.gz
     cd curl-7.37.1/
+    mkdir build
+    cd build
 
-    ./configure --prefix=$YOURPREFIX \
+    ../configure --prefix=$YOURPREFIX \
     --without-nghttp2 --without-libidn --without-winidn --without-libssh2 \
     --without-librtmp --without-libmetalink --without-axtls --without-nss \
     --without-cyassl --without-ssl  --without-gnutls --disable-gopher --disable-smtp \
     --disable-imap --disable-pop3 --disable-tftp --disable-telnet --disable-dict \
-    --disable-proxy --disable-rtsp --disable-ldaps --disable-ldap --disable-file \
+    --disable-rtsp --disable-ldaps --disable-ldap --disable-file \
     --disable-ftp --enable-http --enable-shared=no -enable-static=yes \
-    --with-polarssl=$YOURPREFIX --without-ca-bundle --without-ca-path
+    --with-polarssl=$YOURPREFIX --without-ca-bundle --without-ca-path \
+    --without-zlib
+    make && make install
 
 To compile the software you can use plain cmake. An out of source build is
 highly suggested. For build options see CMakeList.txt
@@ -127,6 +132,21 @@
     nice make -j`nproc` && \
     make install
 
+Change to the curl directory
+    cd ../../curl-7.37.1/
+    mkdir build-i386
+    cd build-i386
+    CFLAGS="-fpic -m32" CPPFLAGS="-fpic -m32" ../configure --prefix=$YOURPREFIX/i386 \
+    --without-nghttp2 --without-libidn --without-winidn --without-libssh2 \
+    --without-librtmp --without-libmetalink --without-axtls --without-nss \
+    --without-cyassl --without-ssl  --without-gnutls --disable-gopher --disable-smtp \
+    --disable-imap --disable-pop3 --disable-tftp --disable-telnet --disable-dict \
+    --disable-rtsp --disable-ldaps --disable-ldap --disable-file \
+    --disable-ftp --enable-http --enable-shared=no -enable-static=yes \
+    --with-polarssl=$YOURPREFIX/i386 --without-ca-bundle --without-ca-path \
+    --without-zlib
+    make && make install
+
 Now for Trustbridge itself
     cd ../../trustbridge
     mkdir build-i386
@@ -190,11 +210,13 @@
 
 Build the windows binaries:
     MXEPATH=$YOURPREFIX/win
-    git clone https://github.com/mxe/mxe.git $MXEPATH
+    git clone https://github.com/Intevation/mxe.git $MXEPATH
     cd $MXEPATH
+    git checkout trustbridge
     echo "MXE_TARGETS := i686-w64-mingw32.static" > settings.mk
     make polarssl
     make qtbase
+(optional) make curl
 
 Workaround Qt CMake Bugs:
     find $MXEPATH/usr/i686-w64-mingw32.static/qt5/lib/cmake -name \*.cmake | \
@@ -202,10 +224,6 @@
     sed -i 's/^_qt5gui_find_extra_libs.*//' \
         $MXEPATH/usr/i686-w64-mingw32.static/qt5/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
 
-Make an NSS build available in the MXE prefix:
-    # TODO -> Document how to build NSS,..
-    cp -r <magic nss folder> $MXEPATH/usr/i686-w64-mingw32.static/
-
 Compile the software:
     cd trustbridge
     mkdir build-windows