diff --git a/Tuprules.tup b/Tuprules.tup
index fef1cc5..19815f5 100644
--- a/Tuprules.tup
+++ b/Tuprules.tup
@@ -4,15 +4,26 @@ ifndef TOOL_CHAIN_PREFIX
 	error TOOL_CHAIN_PREFIX not configured, missing variant?
 endif
 
+DEPOT_DIR  = $(TUP_CWD)/depot
+DEPOT_RAW_DIR = $(DEPOT_DIR)/raw
+DEPOT_PKG_DIR = $(DEPOT_DIR)/pkg
+
+PUBLIC_DIR = $(TUP_CWD)/public
+PUBLIC_RAW_DIR = $(PUBLIC_DIR)/raw
+PUBLIC_BIN_DIR = $(PUBLIC_DIR)/bin
+PUBLIC_PKG_DIR = $(PUBLIC_DIR)/pkg
+
 ifeq (@(TUP_ARCH),i386)
 CC_MARCH = -march=i686 -m32
 LD_MARCH = -melf_i386
 AS_MARCH = -march=i686 --32
+DEPOT_BIN_DIR = $(DEPOT_DIR)/bin/x86_32
 endif
 
 ifeq (@(TUP_ARCH),x86_64)
 CC_MARCH = -m64 -mcmodel=large
 LD_MARCH = -melf_x86_64
+DEPOT_BIN_DIR = $(DEPOT_DIR)/bin/x86_64
 endif
 
 ifeq (@(TUP_ARCH),arm_v8)
@@ -60,16 +71,6 @@ ifeq ($(RAW_VERSION),)
 RAW_VERSION=$(GIT_VERSION)
 endif
 
-DEPOT_DIR  = $(TUP_CWD)/depot
-DEPOT_RAW_DIR = $(DEPOT_DIR)/raw
-DEPOT_BIN_DIR = $(DEPOT_DIR)/bin
-DEPOT_PKG_DIR = $(DEPOT_DIR)/pkg
-
-PUBLIC_DIR = $(TUP_CWD)/public
-PUBLIC_RAW_DIR = $(PUBLIC_DIR)/raw
-PUBLIC_BIN_DIR = $(PUBLIC_DIR)/bin
-PUBLIC_PKG_DIR = $(PUBLIC_DIR)/pkg
-
 RAW_DIR = $(DEPOT_RAW_DIR)/$(RAW_NAME)/current
 	# Destination for locally defined raw package