diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 31c77165bd..05aa5e4da1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-11-11 04:22 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * make_b32.mak
+  * make_vc.mak
+  * make_gcc.mak
+  * common.mak
+    * Changed dll and mt obj locations to reside inside the platform dir:
+      obj/dll/* -> obj/*/dll
+      obj/*_mt -> obj/*/mt
+    + Added provisions for new obj location:
+      obj/*/mt_dll
+
 2008-11-11 03:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * make_b32.mak
   * make_vc.mak
diff --git a/harbour/common.mak b/harbour/common.mak
index 31db26dfce..eb4c875d09 100644
--- a/harbour/common.mak
+++ b/harbour/common.mak
@@ -111,20 +111,17 @@ BIN_DIR = bin\$(HB_CC_NAME)
 OBJ_DIR = obj\$(HB_CC_NAME)
 LIB_DIR = lib\$(HB_CC_NAME)
 
-MT_OBJ_DIR = obj\$(HB_CC_NAME)_mt
-
-DLL_ROOTDIR = obj\dll
-DLL_OBJ_DIR = $(DLL_ROOTDIR)\$(HB_CC_NAME)
+MT_OBJ_DIR = obj\$(HB_CC_NAME)\mt
+MTDLL_OBJ_DIR = obj\$(HB_CC_NAME)\mt_dll
+DLL_OBJ_DIR = obj\$(HB_CC_NAME)\dll
 
 # Targets Destination Directories
 HB_DEST_DIRS = \
-    $(BIN_DIR)      \
-    $(OBJ_DIR)      \
-    $(LIB_DIR)      \
+    $(BIN_DIR) \
+    $(OBJ_DIR) \
+    $(LIB_DIR) \
     \
-    $(MT_OBJ_DIR)   \
-    \
-    $(DLL_ROOTDIR)  \
+    $(MT_OBJ_DIR) \
     $(DLL_OBJ_DIR)
 
 MAIN_DIR     = source\main
diff --git a/harbour/make_b32.mak b/harbour/make_b32.mak
index e7e0db8202..d488134db8 100644
--- a/harbour/make_b32.mak
+++ b/harbour/make_b32.mak
@@ -634,6 +634,9 @@ doClean:
     @if exist $(MT_OBJ_DIR)\*.obj       $(DEL) $(MT_OBJ_DIR)\*.obj       > nul
     @if exist $(MT_OBJ_DIR)\*.c         $(DEL) $(MT_OBJ_DIR)\*.c         > nul
     @if exist $(MT_OBJ_DIR)\*.h         $(DEL) $(MT_OBJ_DIR)\*.h         > nul
+    @if exist $(MTDLL_OBJ_DIR)\*.obj    $(DEL) $(MTDLL_OBJ_DIR)\*.obj    > nul
+    @if exist $(MTDLL_OBJ_DIR)\*.c      $(DEL) $(MTDLL_OBJ_DIR)\*.c      > nul
+    @if exist $(MTDLL_OBJ_DIR)\*.h      $(DEL) $(MTDLL_OBJ_DIR)\*.h      > nul
     @if exist $(DLL_OBJ_DIR)\*.obj      $(DEL) $(DLL_OBJ_DIR)\*.obj      > nul
     @if exist $(DLL_OBJ_DIR)\*.c        $(DEL) $(DLL_OBJ_DIR)\*.c        > nul
     @if exist $(DLL_OBJ_DIR)\*.h        $(DEL) $(DLL_OBJ_DIR)\*.h        > nul
diff --git a/harbour/make_gcc.mak b/harbour/make_gcc.mak
index 8421394d5f..969f1cb927 100644
--- a/harbour/make_gcc.mak
+++ b/harbour/make_gcc.mak
@@ -551,10 +551,13 @@ doClean:
 	-$(DEL) $(MT_OBJ_DIR)/*$(OBJEXT)
 	-$(DEL) $(MT_OBJ_DIR)/*.c
 	-$(DEL) $(MT_OBJ_DIR)/*.h
-	-$(DEL) $(INCLUDE_DIR)/hbverbld.h
+	-$(DEL) $(MTDLL_OBJ_DIR)/*$(OBJEXT)
+	-$(DEL) $(MTDLL_OBJ_DIR)/*.c
+	-$(DEL) $(MTDLL_OBJ_DIR)/*.h
 	-$(DEL) $(DLL_OBJ_DIR)/*$(OBJEXT)
 	-$(DEL) $(DLL_OBJ_DIR)/*.c
 	-$(DEL) $(DLL_OBJ_DIR)/*.h
+	-$(DEL) $(INCLUDE_DIR)/hbverbld.h
 	-$(DEL) inst_$(HB_CC_NAME).log
 	-$(DEL) common.cf
 
diff --git a/harbour/make_vc.mak b/harbour/make_vc.mak
index 80f89cf58c..02c3b3156d 100644
--- a/harbour/make_vc.mak
+++ b/harbour/make_vc.mak
@@ -87,9 +87,9 @@ MKLIB  = lib.exe
 # Nmake does not support macros in string
 # substitution, so we have to hardcode it
 
-DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\dll\vc)
+DLL_OBJS = $(TMP_DLL_OBJS:obj\vc=obj\vc\dll)
 
-VMMT_LIB_OBJS = $(VM_LIB_OBJS:obj\vc=obj\vc_mt)
+VMMT_LIB_OBJS = $(VM_LIB_OBJS:obj\vc=obj\vc\mt)
 
 !if "$(HB_BUILD_WINCE)" == "yes"
 HARBOURFLAGS    = $(HARBOURFLAGS) -gc0
@@ -903,7 +903,7 @@ $(STANDARD_SYSLIBS)
 #**********************************************************
 # DLL EXECUTABLE Targets
 #**********************************************************
-HBTESTDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:obj\vc=obj\dll\vc)
+HBTESTDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBTEST_EXE_OBJS:obj\vc=obj\vc\dll)
 $(HBTESTDLL_EXE) : $(HARBOUR_DLL) $(HBTESTDLL_OBJS)
     $(LINKER) @<<
 $(LDFLAGS)
@@ -914,7 +914,7 @@ $(HARBOUR_DLL:.dll=.lib)
 $(COMMON_LIB)
 <<$(HB_KEEPSTATE)
 #**********************************************************
-HBRUNDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBRUN_EXE_OBJS:obj\vc=obj\dll\vc)
+HBRUNDLL_OBJS = $(DLL_OBJ_DIR)\mainstd$(OBJEXT) $(HBRUN_EXE_OBJS:obj\vc=obj\vc\dll)
 $(HBRUNDLL_EXE) : $(HARBOUR_DLL) $(HBRUNDLL_OBJS)
     $(LINKER) @<<
 $(LDFLAGS)
@@ -1018,6 +1018,9 @@ doClean:
     @if exist $(MT_OBJ_DIR)\*.obj       $(DEL) $(MT_OBJ_DIR)\*.obj       > nul
     @if exist $(MT_OBJ_DIR)\*.c         $(DEL) $(MT_OBJ_DIR)\*.c         > nul
     @if exist $(MT_OBJ_DIR)\*.h         $(DEL) $(MT_OBJ_DIR)\*.h         > nul
+    @if exist $(MTDLL_OBJ_DIR)\*.obj    $(DEL) $(MTDLL_OBJ_DIR)\*.obj    > nul
+    @if exist $(MTDLL_OBJ_DIR)\*.c      $(DEL) $(MTDLL_OBJ_DIR)\*.c      > nul
+    @if exist $(MTDLL_OBJ_DIR)\*.h      $(DEL) $(MTDLL_OBJ_DIR)\*.h      > nul
     @if exist $(DLL_OBJ_DIR)\*.obj      $(DEL) $(DLL_OBJ_DIR)\*.obj      > nul
     @if exist $(DLL_OBJ_DIR)\*.c        $(DEL) $(DLL_OBJ_DIR)\*.c        > nul
     @if exist $(DLL_OBJ_DIR)\*.h        $(DEL) $(DLL_OBJ_DIR)\*.h        > nul