diff --git a/trex.mak b/trex.mak
index 5a7a07ac4d92..1586907bcd53 100644
--- a/trex.mak
+++ b/trex.mak
@@ -97,8 +97,11 @@ RAPTOR_LAYOUT_DIR       = $(MOZ_TOP)/layout
 TREX_GCONFIG_BRANCH     = 
 TREX_GCONFIG_DIR        = $(MOZ_TOP)/gconfig
 
+TREX_XPFC_BRANCH        = 
+TREX_XPFC_DIR           = mozilla/xpfc
+
 TREX_TREX_BRANCH        = 
-TREX_TREX_DIR           = ns/trex
+TREX_TREX_DIR           = mozilla/trex
 
 LIBNLS_BRANCH           = -r libnls_v3_Normandy
 LIBNLS_DIR              = ns/modules/libnls
@@ -210,8 +213,8 @@ pull_trex::
     @echo +++ trex.mak: checking out trex with "$(CVTREX)"
     cd $(MOZ_SRC)\.
     -$(CVS)  $(TREX_GCONFIG_BRANCH)  $(TREX_GCONFIG_DIR)
-    cd $(MOZ_SRC)\$(MOZ_TOP)
-    -$(CVST) $(TREX_TREX_BRANCH)  -d trex  $(TREX_TREX_DIR)
+    -$(CVS)  $(TREX_XPFC_BRANCH)     $(TREX_XPFC_DIR)
+    -$(CVS)  $(TREX_TREX_BRANCH)     $(TREX_TREX_DIR)
     cd $(MOZ_SRC)\.
 
 
@@ -238,7 +241,9 @@ build_julian::
     cd $(MOZ_SRC)\.
 
 build_trex:: 
-    cd $(MOZ_SRC)\$(MOZ_TOP)\trex
+    cd $(MOZ_SRC)\$(MOZ_TOP)\xpfc
+    nmake -f makefile.win
+    cd $(MOZ_SRC)\$(MOZ_TOP)\calendar
     nmake -f makefile.win
     cd $(MOZ_SRC)\.
 
diff --git a/trex.mk b/trex.mk
index 1e8bb80c6250..bf47ce5dedd4 100644
--- a/trex.mk
+++ b/trex.mk
@@ -69,11 +69,8 @@ pull_julian:
 pull_trex:
 	cd $(MOZ_SRC); \
 	$(CVS)  mozilla/gconfig; \
-	cd $(MOZ_SRC)/.
-
-pull_trex_ns:
-	cd $(MOZ_SRC)/mozilla; \
-	$(CVST)  -d trex ns/trex; \
+	$(CVS)  mozilla/xpfc; \
+	$(CVS)  mozilla/calendar; \
 	cd $(MOZ_SRC)/.
 
 build_all: build_platform build_julian build_trex
@@ -95,7 +92,9 @@ build_julian::
 build_trex:
 	cd $(MOZ_SRC)/mozilla/gconfig; \
 	gmake; \
-	cd $(MOZ_SRC)/mozilla/trex; \
+	cd $(MOZ_SRC)/mozilla/xpfc; \
+	gmake; \
+	cd $(MOZ_SRC)/mozilla/calendar; \
 	gmake; \
 	cd $(MOZ_SRC)