diff --git a/Makefile b/Makefile
index ad0aee9e..16b88a84 100644
--- a/Makefile
+++ b/Makefile
@@ -16,6 +16,7 @@ export SQ_DEFINES
 export SQ_INCLUDES
 export SQ_LIBRARIES
 export SQ_MAKE_THREADS = 1
+export SQ_DEBUG_POSTFIX
 
 SQ_MAKE += -j$(SQ_MAKE_THREADS)
 
@@ -63,6 +64,10 @@ ifdef ARCH
 	SQ_ARCH = $(ARCH)
 endif
 
+ifdef DEBUG
+	SQ_DEBUG_POSTFIX = -d
+else
+
 export SQ_INCDIR=$(SQ_BASEDIR)/include
 export SQ_SHRDIR=$(SQ_BASEDIR)/shared
 export SQ_MODDIR=$(SQ_BASEDIR)/modules
@@ -71,10 +76,10 @@ export SQ_BASE_CFGDIR=$(SQ_BASEDIR)/config
 export SQ_BASE_LIBDIR=$(SQ_BASEDIR)/lib
 export SQ_BASE_OBJDIR=$(SQ_BASEDIR)/obj
 export SQ_BASE_BINDIR=$(SQ_BASEDIR)/bin
-export SQ_CFGDIR=$(SQ_BASE_CFGDIR)/$(SQ_COMP)$(SQ_ARCH)
-export SQ_LIBDIR=$(SQ_BASE_LIBDIR)/$(SQ_COMP)$(SQ_ARCH)
-export SQ_OBJDIR=$(SQ_BASE_OBJDIR)/$(SQ_COMP)$(SQ_ARCH)
-export SQ_BINDIR=$(SQ_BASE_BINDIR)/$(SQ_PLAT)$(SQ_ARCH)
+export SQ_CFGDIR=$(SQ_BASE_CFGDIR)/$(SQ_COMP)$(SQ_ARCH)$(SQ_DEBUG_POSTFIX)
+export SQ_LIBDIR=$(SQ_BASE_LIBDIR)/$(SQ_COMP)$(SQ_ARCH)$(SQ_DEBUG_POSTFIX)
+export SQ_OBJDIR=$(SQ_BASE_OBJDIR)/$(SQ_COMP)$(SQ_ARCH)$(SQ_DEBUG_POSTFIX)
+export SQ_BINDIR=$(SQ_BASE_BINDIR)/$(SQ_PLAT)$(SQ_ARCH)$(SQ_DEBUG_POSTFIX)
 export SQ_OUTDIR=
 
 ifdef STANDALONE