diff --git a/zOS/Makefile.zpu b/zOS/Makefile.zpu
index d9f686b..a04b600 100644
--- a/zOS/Makefile.zpu
+++ b/zOS/Makefile.zpu
@@ -54,10 +54,8 @@ ifeq ($(OS_APPADDR),)
 OS_APPADDR  = 0x0C000
 endif
 
-BASEDIR         = ../..
-#BASEDIR        = ../../..
-SWDIR           = $(BASEDIR)/software
-#SWDIR          = $(BASEDIR)/software/zpu
+BASEDIR         = $(CURDIR)/..
+SWDIR           = $(BASEDIR)/
 ROMGEN          = $(SWDIR)/tools/zpugen
 IOCPDIR         = $(SWDIR)/iocp
 
@@ -65,7 +63,7 @@ IOCPDIR         = $(SWDIR)/iocp
 STARTUP_DIR     = $(SWDIR)/startup
 
 # we fetch RAM prologue / epilogue from here
-RTL_DIR         = $(BASEDIR)/software/rtl
+RTL_DIR         = $(BASEDIR)/rtl
 
 # we use printf from here
 COMMON_DIR      = $(SWDIR)/common
diff --git a/zputa/Makefile.zpu b/zputa/Makefile.zpu
index 0d401a5..9d44816 100644
--- a/zputa/Makefile.zpu
+++ b/zputa/Makefile.zpu
@@ -53,10 +53,8 @@ ifeq ($(OS_APPADDR),)
 OS_APPADDR  = 0x0C000
 endif
 
-BASEDIR         = ../..
-#BASEDIR        = ../../..
-SWDIR           = $(BASEDIR)/software
-#SWDIR          = $(BASEDIR)/software/zpu
+BASEDIR         = $(CURDIR)/..
+SWDIR           = $(BASEDIR)/
 ROMGEN          = $(SWDIR)/tools/zpugen
 IOCPDIR         = $(SWDIR)/iocp
 
@@ -64,7 +62,7 @@ IOCPDIR         = $(SWDIR)/iocp
 STARTUP_DIR     = $(SWDIR)/startup
 
 # we fetch RAM prologue / epilogue from here
-RTL_DIR         = $(BASEDIR)/software/rtl
+RTL_DIR         = $(BASEDIR)/rtl
 
 # we use printf from here
 COMMON_DIR      = $(SWDIR)/common