diff --git a/bin/llvmdc.conf b/bin/llvmdc.conf
index c9dbc8ad..13fcb947 100644
--- a/bin/llvmdc.conf
+++ b/bin/llvmdc.conf
@@ -1,4 +1,4 @@
 
 [Environment]
 
-DFLAGS=-I%@P%/../tango -I%@P%/../tango/lib/common -I%@P%/../import -L-L%@P%/../lib -R%@P%/../lib
+DFLAGS=-I%@P%/../tango -I%@P%/../tango/lib/common -L-L%@P%/../lib -R%@P%/../lib
diff --git a/bin/llvmdc.ini b/bin/llvmdc.ini
index bdf14356..964ac731 100644
--- a/bin/llvmdc.ini
+++ b/bin/llvmdc.ini
@@ -1,2 +1,2 @@
 [Environment]
-DFLAGS=-I%@P%/../tango -I%@P%/../tango/lib/common -I%@P%/../import -L-L%@P%/../lib -R%@P%/../lib
+DFLAGS=-I%@P%/../tango -I%@P%/../tango/lib/common -L-L%@P%/../lib -R%@P%/../lib
diff --git a/runtime/build.sh b/runtime/build.sh
index ade5dfee..71dcac33 100755
--- a/runtime/build.sh
+++ b/runtime/build.sh
@@ -3,8 +3,10 @@
 # I'm no good bash scripter ...
 
 # copy imports
-cp -u internal/llvmdc/bitmanip.d ../import/llvmdc/bitmanip.di
-cp -u internal/llvmdc/vararg.d ../import/llvmdc/vararg.di
+mkdir -p ../tango/llvmdc
+cp -u internal/llvmdc/bitmanip.d ../tango/llvmdc/bitmanip.di
+cp -u internal/llvmdc/vararg.d ../tango/llvmdc/vararg.di
+cp -u import/llvmdc/* ../tango/llvmdc
 
 # make the runtime
 cp -Ru lib ../tango
diff --git a/import/llvmdc/cstdarg.di b/runtime/import/llvmdc/cstdarg.di
similarity index 100%
rename from import/llvmdc/cstdarg.di
rename to runtime/import/llvmdc/cstdarg.di
diff --git a/import/llvmdc/intrinsics.di b/runtime/import/llvmdc/intrinsics.di
similarity index 100%
rename from import/llvmdc/intrinsics.di
rename to runtime/import/llvmdc/intrinsics.di