diff --git a/dcompiler.dd b/dcompiler.dd
index 753206ee59..707b809bb7 100644
--- a/dcompiler.dd
+++ b/dcompiler.dd
@@ -98,7 +98,7 @@ export PATH="$HOME/dmd/linux/bin64:$PATH"
 
 ---
 [Environment64]
-DFLAGS=-I/usr/local/include/d/dmd -L-L/usr/local/lib -L--export-dynamic -fPIC
+DFLAGS=-I/usr/local/include/d/dmd/druntime -I/usr/local/include/d/dmd/phobos -L-L/usr/local/lib -L--export-dynamic -fPIC
 ---
 
     )
@@ -106,22 +106,23 @@ DFLAGS=-I/usr/local/include/d/dmd -L-L/usr/local/lib -L--export-dynamic -fPIC
     $(LI Copy binaries to $(D /usr/local/bin):
 
 $(CONSOLE
-sudo cp $(DMDDIR)/linux/bin64/{dmd,$(DUMPOBJ),$(OBJ2ASM),rdmd,ddemangle,dub,dustmite} /usr/local/bin
+sudo cp $(DMDDIR)/linux/bin64/{dmd,rdmd,ddemangle,dub,dustmite} /usr/local/bin
 )
     )
 
     $(LI Copy the library to $(D /usr/local/lib):
 
 $(CONSOLE
-sudo cp $(DMDDIR)/linux/lib64/$(LIB) /usr/local/lib
+sudo cp -P $(DMDDIR)/linux/lib64/* /usr/local/lib/
 )
     )
 
-    $(LI Copy the standard library and runtime sources to $(D /usr/include/d/dmd):
+    $(LI Copy the standard library and runtime sources to $(D /usr/local/include/d/dmd):
 
 $(CONSOLE
-sudo mkdir -p /usr/include/d/dmd
-sudo cp $(DMDDIR)/{phobos/std,phobos/etc,druntime/import} /usr/include/d/dmd
+sudo mkdir -p /usr/local/include/d/dmd/{phobos,druntime}
+sudo cp $(DMDDIR)/phobos/{std,etc} /usr/local/include/d/dmd/phobos/
+sudo cp $(DMDDIR)/druntime/import/* /usr/local/include/d/dmd/druntime/
 )
 
     )
@@ -144,7 +145,7 @@ sudo cp $(DMDDIR)/{phobos/std,phobos/etc,druntime/import} /usr/include/d/dmd
 
 ---
 [Environment64]
-DFLAGS=-I/usr/local/include/d/dmd -L-L/usr/local/lib -L--export-dynamic -fPIC
+DFLAGS=-I/usr/local/include/d/dmd/druntime -I/usr/local/include/d/dmd/phobos -L-L/usr/local/lib -L--export-dynamic -fPIC
 ---
 
     )
@@ -155,7 +156,7 @@ DFLAGS=-I/usr/local/include/d/dmd -L-L/usr/local/lib -L--export-dynamic -fPIC
     to $(D /usr/local/bin):)
 
 $(CONSOLE
-sudo cp $(DMDDIR)/linux/bin64/{dmd,$(DUMPOBJ),$(OBJ2ASM),rdmd,ddemangle,dub,dustmite} /usr/local/bin
+sudo cp $(DMDDIR)/linux/bin64/{dmd,rdmd,ddemangle,dub,dustmite} /usr/local/bin
 )
 
     $(LI Copy the library to $(D /usr/lib):
@@ -165,11 +166,12 @@ sudo cp $(DMDDIR)/freebsd/lib/$(LIB) /usr/lib
 )
     )
 
-    $(LI Copy the standard library and runtime sources to $(D /usr/include/d/dmd):
+    $(LI Copy the standard library and runtime sources to $(D /usr/local/include/d/dmd):
 
 $(CONSOLE
-sudo mkdir -p /usr/include/d/dmd
-sudo cp $(DMDDIR)/{phobos/std,phobos/etc,druntime/import} /usr/include/d/dmd
+sudo mkdir -p /usr/local/include/d/dmd/{phobos,druntime}
+sudo cp $(DMDDIR)/phobos/{std,etc} /usr/local/include/d/dmd/phobos/
+sudo cp $(DMDDIR)/druntime/import/* /usr/local/include/d/dmd/druntime/
 )
     )
     ))
@@ -235,8 +237,9 @@ sudo cp $(DMDDIR)/osx/lib/$(LIB) /usr/local/lib
     $(LI Copy the standard library and runtime sources to $(D /usr/local/include/d/dmd):
 
 $(CONSOLE
-sudo mkdir -p /usr/include/d/dmd
-sudo cp $(DMDDIR)/{phobos/std,phobos/etc,druntime/import} /usr/include/d/dmd
+sudo mkdir -p /usr/local/include/d/dmd/{phobos,druntime}
+sudo cp $(DMDDIR)/phobos/{std,etc} /usr/local/include/d/dmd/phobos/
+sudo cp $(DMDDIR)/druntime/import/* /usr/local/include/d/dmd/druntime/
 )
     )