diff --git a/.hgignore b/.hgignore
index 96ea69ce7..d5b25104e 100644
--- a/.hgignore
+++ b/.hgignore
@@ -7,5 +7,3 @@ build
 doc/html.*
 doc/latex.*
 .lock-wscript
-.waf*
-waf
diff --git a/examples/waf b/examples/waf
new file mode 100755
index 000000000..191b7dbb2
--- /dev/null
+++ b/examples/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../waf "$@"
diff --git a/samples/waf b/samples/waf
new file mode 100755
index 000000000..191b7dbb2
--- /dev/null
+++ b/samples/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../waf "$@"
diff --git a/src/applications/waf b/src/applications/waf
new file mode 100755
index 000000000..3dcf598bc
--- /dev/null
+++ b/src/applications/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../../waf "$@"
\ No newline at end of file
diff --git a/src/common/waf b/src/common/waf
new file mode 100755
index 000000000..3dcf598bc
--- /dev/null
+++ b/src/common/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../../waf "$@"
\ No newline at end of file
diff --git a/src/core/waf b/src/core/waf
new file mode 100755
index 000000000..3dcf598bc
--- /dev/null
+++ b/src/core/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../../waf "$@"
\ No newline at end of file
diff --git a/src/devices/csma/waf b/src/devices/csma/waf
new file mode 100755
index 000000000..4283ec141
--- /dev/null
+++ b/src/devices/csma/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../../../waf "$@"
diff --git a/src/devices/point-to-point/waf b/src/devices/point-to-point/waf
new file mode 100755
index 000000000..4283ec141
--- /dev/null
+++ b/src/devices/point-to-point/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../../../waf "$@"
diff --git a/src/internet-node/waf b/src/internet-node/waf
new file mode 100755
index 000000000..3dcf598bc
--- /dev/null
+++ b/src/internet-node/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../../waf "$@"
\ No newline at end of file
diff --git a/src/mobility/waf b/src/mobility/waf
new file mode 100755
index 000000000..3dcf598bc
--- /dev/null
+++ b/src/mobility/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../../waf "$@"
\ No newline at end of file
diff --git a/src/node/waf b/src/node/waf
new file mode 100755
index 000000000..3dcf598bc
--- /dev/null
+++ b/src/node/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../../waf "$@"
\ No newline at end of file
diff --git a/src/routing/global-routing/waf b/src/routing/global-routing/waf
new file mode 100755
index 000000000..4283ec141
--- /dev/null
+++ b/src/routing/global-routing/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../../../waf "$@"
diff --git a/src/simulator/waf b/src/simulator/waf
new file mode 100755
index 000000000..3dcf598bc
--- /dev/null
+++ b/src/simulator/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../../waf "$@"
\ No newline at end of file
diff --git a/utils/waf b/utils/waf
new file mode 100755
index 000000000..191b7dbb2
--- /dev/null
+++ b/utils/waf
@@ -0,0 +1 @@
+exec "`dirname "$0"`"/../waf "$@"