diff --git a/posix.mak b/posix.mak
index f246c0c9e60..0fb08876e65 100644
--- a/posix.mak
+++ b/posix.mak
@@ -32,9 +32,9 @@ QUIET:=@
 
 DEBUGGER=gdb
 GIT_HOME=https://github.com/dlang
-DMD_DIR=../dmd
+DMD_DIR=../dmd/compiler
 
-include $(DMD_DIR)/compiler/src/osmodel.mak
+include $(DMD_DIR)/src/osmodel.mak
 
 ifeq (osx,$(OS))
 	export MACOSX_DEPLOYMENT_TARGET=10.9
@@ -94,7 +94,7 @@ ifeq ($(OS),win32wine)
 	DMD = wine dmd.exe
 	RUN = wine
 else
-	DMD = $(DMD_DIR)/generated/$(OS)/$(BUILD)/$(MODEL)/dmd
+	DMD = $(DMD_DIR)/../generated/$(OS)/$(BUILD)/$(MODEL)/dmd
 	ifeq ($(OS),win32)
 		CC = dmc
 	else
@@ -182,7 +182,7 @@ LINKDL:=$(if $(findstring $(OS),linux),-L-ldl,)
 TIMELIMIT:=$(if $(shell which timelimit 2>/dev/null || true),timelimit -t 90 ,)
 
 # Set VERSION, where the file is that contains the version string
-VERSION=$(DMD_DIR)/VERSION
+VERSION=$(DMD_DIR)/../VERSION
 
 # Set LIB, the ultimate target
 ifeq (,$(findstring win,$(OS)))
diff --git a/win32.mak b/win32.mak
index b29fad7589e..aa92f53f6e2 100644
--- a/win32.mak
+++ b/win32.mak
@@ -59,10 +59,10 @@ MAKE=make
 
 ## D compiler
 
-DMD_DIR=../dmd
+DMD_DIR=../dmd/compiler
 BUILD=release
 OS=windows
-DMD=$(DMD_DIR)/generated/$(OS)/$(BUILD)/32/dmd
+DMD=$(DMD_DIR)/../generated/$(OS)/$(BUILD)/32/dmd
 
 ## Zlib library
 
diff --git a/win64.mak b/win64.mak
index f094ab12170..38910d4b3e7 100644
--- a/win64.mak
+++ b/win64.mak
@@ -48,10 +48,10 @@ UDFLAGS=-conf= -g -m$(MODEL) -O -w -preview=dip1000 -preview=fieldwise -I$(DRUNT
 
 ## D compiler
 
-DMD_DIR=../dmd
+DMD_DIR=../dmd/compiler
 BUILD=release
 OS=windows
-DMD=$(DMD_DIR)/generated/$(OS)/$(BUILD)/$(MODEL)/dmd
+DMD=$(DMD_DIR)/../generated/$(OS)/$(BUILD)/$(MODEL)/dmd
 
 ## Zlib library