diff --git a/demos/d/example.d b/demos/d/example.d
index afd5710d..461b11b1 100644
--- a/demos/d/example.d
+++ b/demos/d/example.d
@@ -4,7 +4,7 @@ def.	gh;
 import std.stdio;       // for writefln()
 import std .  // system2;
 system  ;
-static import std.date, std.thread /+ /+ +/ , std.io +/ ;
+//static import std.date, std.thread /+ /+ +/ , std.io +/ ;
 
 import testlib.code;
 
diff --git a/waflib/Tools/d.py b/waflib/Tools/d.py
index bf98784d..1af81fa5 100644
--- a/waflib/Tools/d.py
+++ b/waflib/Tools/d.py
@@ -27,7 +27,7 @@ class d_header(Task.Task):
 
 class dprogram(link_task):
 	"Link object files into a d program"
-	run_str = '${D_LINKER} ${LINKFLAGS} ${DLNK_SRC_F}${SRC} ${DLNK_TGT_F:TGT} ${RPATH_ST:RPATH} ${DSTLIB_MARKER} ${DSTLIBPATH_ST:STLIBPATH} ${DSTLIB_ST:STLIB} ${DSHLIB_MARKER} ${LIBPATH_ST:LIBPATH} ${DSHLIB_ST:LIB}'
+	run_str = '${D_LINKER} ${LINKFLAGS} ${DLNK_SRC_F}${SRC} ${DLNK_TGT_F:TGT} ${RPATH_ST:RPATH} ${DSTLIB_MARKER} ${DSTLIBPATH_ST:STLIBPATH} ${DSTLIB_ST:STLIB} ${DSHLIB_MARKER} ${DLIBPATH_ST:LIBPATH} ${DSHLIB_ST:LIB}'
 	inst_to = '${BINDIR}'
 	chmod   = Utils.O755
 
diff --git a/waflib/Tools/dmd.py b/waflib/Tools/dmd.py
index 99911522..45e4cb85 100644
--- a/waflib/Tools/dmd.py
+++ b/waflib/Tools/dmd.py
@@ -64,7 +64,7 @@ def common_flags_dmd(conf):
 	v['D_HDR_F']           = '%s'
 
 class d2program(ccroot.link_task):
-	run_str = '${D} ${LINKFLAGS} ${D2LINKFLAGS} ${SRC} ${DLNK_TGT_F:TGT}'
+	run_str = '${D} ${LINKFLAGS} ${D2LINKFLAGS} ${DINC_ST:INCPATHS} ${SRC} ${DLNK_TGT_F:TGT} ${DSTLIB_MARKER} ${DSTLIBPATH_ST:STLIBPATH} ${DSTLIB_ST:STLIB} ${DSHLIB_MARKER} ${DLIBPATH_ST:LIBPATH} ${DSHLIB_ST:LIB}'
 	inst_to = '${BINDIR}'
 	chmod   = Utils.O755
 
@@ -96,6 +96,14 @@ def configure(conf):
 			conf.env['d2stlib_PATTERN']   = 'lib%s.a'
 
 		conf.env.D2LINKFLAGS_dstlib = ['-lib']
+		#conf.env.DSTLIBPATH_ST = '-L%s'
+		conf.env.DSTLIB_ST = '-l'
+		conf.env.DINC_ST   = '-I%s'
+
+		v = conf.env
+		v['DSHLIB_MARKER'] = v['DSTLIB_MARKER'] = ''
+		v['DSTLIB_ST'] = v['DSHLIB_ST']         = '-L-l%s'
+		v['DSTLIBPATH_ST'] = v['DLIBPATH_ST']   = '-L-L%s'
 	else:
 		conf.load('ar')
 		conf.load('d')