diff --git a/ports/src/vancouver/32bit/target.mk b/ports/src/vancouver/32bit/target.mk
new file mode 100644
index 000000000..e95f2b356
--- /dev/null
+++ b/ports/src/vancouver/32bit/target.mk
@@ -0,0 +1,5 @@
+REQUIRES = 32bit
+
+LD_TEXT_ADDR = 0xbf800000
+
+include $(REP_DIR)/src/vancouver/target.inc
diff --git a/ports/src/vancouver/64bit/target.mk b/ports/src/vancouver/64bit/target.mk
new file mode 100644
index 000000000..6652af337
--- /dev/null
+++ b/ports/src/vancouver/64bit/target.mk
@@ -0,0 +1,5 @@
+REQUIRES = 64bit
+
+LD_TEXT_ADDR = 0x7fffff800000
+
+include $(REP_DIR)/src/vancouver/target.inc
diff --git a/ports/src/vancouver/target.mk b/ports/src/vancouver/target.inc
similarity index 90%
rename from ports/src/vancouver/target.mk
rename to ports/src/vancouver/target.inc
index 4fd248e35..a180035ef 100644
--- a/ports/src/vancouver/target.mk
+++ b/ports/src/vancouver/target.inc
@@ -5,7 +5,7 @@ VANCOUVER_DIR = $(CONTRIB_DIR)
 GENODE_DIR = $(CONTRIB_DIR)/genode
 NOVA_INCLUDE_DIR = $(REP_DIR)/contrib/seoul-git/include
 
-REQUIRES = nova
+REQUIRES += nova
 
 ifeq ($(wildcard $(VANCOUVER_DIR)),)
 REQUIRES += prepare_ports_vancouver
@@ -29,8 +29,8 @@ SRC_CC += $(filter-out $(FILTER_OUT),$(addprefix model/,$(MODEL_SRC_CC)))
 SRC_CC += $(filter-out $(FILTER_OUT),$(addprefix executor/,$(EXECUTOR_SRC_CC)))
 SRC_CC += model/sink.cc
 
-INC_DIR += $(PRG_DIR)
-INC_DIR += $(PRG_DIR)/executor
+INC_DIR += $(PRG_DIR)/..
+INC_DIR += $(PRG_DIR)/../executor
 INC_DIR += $(VANCOUVER_DIR)/model
 INC_DIR += $(VANCOUVER_DIR)/executor
 INC_DIR += $(VANCOUVER_DIR)/include $(GENODE_DIR)/include
@@ -39,7 +39,7 @@ INC_DIR += $(NOVA_INCLUDE_DIR)
 CC_WARN += -Wno-parentheses
 CC_CXX_OPT += -std=gnu++11
 
-LD_TEXT_ADDR = 0xb0000000
-
 vpath %.cc $(VANCOUVER_DIR)
 vpath %.cc $(CONTRIB_DIR)
+vpath %.cc $(PRG_DIR)/..
+vpath %.tff $(PRG_DIR)/..