diff --git a/mozilla/cmd/Makefile b/mozilla/cmd/Makefile
index 5b0655dbf5b..a94117f4d3f 100644
--- a/mozilla/cmd/Makefile
+++ b/mozilla/cmd/Makefile
@@ -17,7 +17,9 @@
 
 DEPTH	= ..
 
-ifeq ($(shell uname -s),Rhapsody)
+include $(DEPTH)/config/config.mk
+
+ifeq ($(OS_ARCH),Rhapsody)
 DIRS  = ybfe
 else
 DIRS  = xfe