diff --git a/configure/RULES_PY b/configure/RULES_PY
index 1a9db99..f1ea75a 100644
--- a/configure/RULES_PY
+++ b/configure/RULES_PY
@@ -1,9 +1,14 @@
+ifneq ($(T_A),)
 
-PY_FILES = $(PY:%=$(INSTALL_LOCATION)/python/%)
+PY_INSTALL_DIR = $(INSTALL_LOCATION)/python/$(T_A)
 
-$(PY_FILES) : $(INSTALL_LOCATION)/python/%: ../%
+PY_FILES += $(PY:%=$(PY_INSTALL_DIR)/%)
+
+$(PY_FILES) : $(PY_INSTALL_DIR)/%: ../%
 	@[ -d $(dir $@) ] || install -d $(dir $@)
 	@echo "Install PY $@"
 	install -m 644 $< $@
 
 build: $(PY_FILES)
+
+endif
diff --git a/iocBoot/iocweatherbnl/st.cmd b/iocBoot/iocweatherbnl/st.cmd
index 3c80ec8..1e28854 100755
--- a/iocBoot/iocweatherbnl/st.cmd
+++ b/iocBoot/iocweatherbnl/st.cmd
@@ -6,7 +6,7 @@ cd("$(TOP)")
 
 epicsEnvSet("http_proxy", "http://proxy:8888/")
 
-epicsEnvSet("PYTHONPATH", "${TOP}/python")
+epicsEnvSet("PYTHONPATH", "${TOP}/python/$(ARCH)")
 
 dbLoadDatabase("dbd/softIocPy.dbd")
 softIocPy_registerRecordDeviceDriver(pdbbase)
diff --git a/test.cmd b/test.cmd
index f2b5f2d..39434d7 100644
--- a/test.cmd
+++ b/test.cmd
@@ -1,6 +1,6 @@
 #!./bin/linux-x86/softIocPy
 
-epicsEnvSet("PYTHONPATH", "${PWD}/python:${PWD}/testApp")
+epicsEnvSet("PYTHONPATH", "${PWD}/python/linux-x86:${PWD}/testApp")
 
 dbLoadDatabase("dbd/softIocPy.dbd")
 softIocPy_registerRecordDeviceDriver(pdbbase)