Index: tools/xcw/bin/helenos-cc
===================================================================
--- tools/xcw/bin/helenos-cc	(revision 3daa163733ef734b4f644bdcc2bf1146018b2083)
+++ tools/xcw/bin/helenos-cc	(revision 1b9a85373ff0aff43cc6c935c09241729161e12f)
@@ -35,12 +35,12 @@
 
 XCW="$(dirname "$0")"
-SRC_ROOT="$XCW/../../.."
+BUILD_ROOT="$(dirname "$(dirname "$(dirname "$XCW")")")"
 if [ -z "$EXPORT_DIR" ]; then
-	EXPORT_DIR="$SRC_ROOT/build/dist"
+	EXPORT_DIR="$BUILD_ROOT/export"
 fi
 
 HELENOS_EXPORT_ROOT="$EXPORT_DIR"
 
-source "${EXPORT_DIR}/config/config.sh"
+source "${EXPORT_DIR}/config.sh"
 
 # CC is a compilation driver, so we should check which stage of compilation
Index: tools/xcw/bin/helenos-ld
===================================================================
--- tools/xcw/bin/helenos-ld	(revision 1b9a85373ff0aff43cc6c935c09241729161e12f)
+++ tools/xcw/bin/helenos-ld	(revision 1b9a85373ff0aff43cc6c935c09241729161e12f)
@@ -0,0 +1,1 @@
+helenos-cc
Index: tools/xcw/demo/Makefile
===================================================================
--- tools/xcw/demo/Makefile	(revision 3daa163733ef734b4f644bdcc2bf1146018b2083)
+++ tools/xcw/demo/Makefile	(revision 1b9a85373ff0aff43cc6c935c09241729161e12f)
@@ -36,7 +36,10 @@
 #
 #    cd <helenos-source-dir>
-#    make distclean && make -j 4 PROFILE=amd64
-#    cd <helenos-source-dir>/tools/xcw/demo
-#    export PATH=$PATH:<helenos-source-dir>/tools/xcw/bin
+#    mkdir build
+#    cd build
+#    ../configure.sh
+#    ninja
+#    cd ../tools/xcw/demo
+#    export PATH=$PATH:<helenos-source-dir>/build/tools/xcw/bin
 #    make
 #