diff -aruN a/source/data/Makefile.in b/source/data/Makefile.in
--- a/source/data/Makefile.in	2010-04-28 08:28:50.000000000 -0700
+++ b/source/data/Makefile.in	2012-04-26 10:00:26.283892893 -0700
@@ -66,6 +66,8 @@
 OUTDIR=$(top_builddir)/data/out
 endif
 
+CONFDIR=$(top_builddir)/data
+
 OUTTMPDIR=$(OUTDIR)/tmp
 MAINBUILDDIR=$(OUTDIR)/build
 BUILDDIR=$(MAINBUILDDIR)/$(ICUDATA_PLATFORM_NAME)
@@ -73,24 +75,35 @@
 LOCSRCDIR=$(SRCDATADIR)/locales
+LOCCONFDIR=$(CONFDIR)/locales
 CURRSRCDIR=$(SRCDATADIR)/curr
 CURRBLDDIR=$(BUILDDIR)/curr
+CURRCONFDIR=$(CONFDIR)/curr
 LANGSRCDIR=$(SRCDATADIR)/lang
 LANGBLDDIR=$(BUILDDIR)/lang
+LANGCONFDIR=$(CONFDIR)/lang
 REGIONSRCDIR=$(SRCDATADIR)/region
 REGIONBLDDIR=$(BUILDDIR)/region
+REGIONCONFDIR=$(CONFDIR)/region
 ZONESRCDIR=$(SRCDATADIR)/zone
 ZONEBLDDIR=$(BUILDDIR)/zone
+ZONECONFDIR=$(CONFDIR)/zone
 COLSRCDIR=$(SRCDATADIR)/coll
 COLBLDDIR=$(BUILDDIR)/coll
+COLCONFDIR=$(CONFDIR)/coll
 RBNFSRCDIR=$(SRCDATADIR)/rbnf
 RBNFBLDDIR=$(BUILDDIR)/rbnf
+RBNFCONFDIR=$(CONFDIR)/rbnc
 TRANSLITSRCDIR=$(SRCDATADIR)/translit
 TRANSLITBLDDIR=$(BUILDDIR)/translit
+TRANSLITCONFDIR=$(CONFDIR)/translit
 MISCSRCDIR=$(SRCDATADIR)/misc
+MISCCONFDIR=$(CONFDIR)/misc
 BRKSRCDIR=$(SRCDATADIR)/brkitr
 BRKBLDDIR=$(BUILDDIR)/brkitr
-MISCSRCDIR=$(SRCDATADIR)/misc
+BRKCONFDIR=$(CONFDIR)/brkitr
 UCMSRCDIR=$(SRCDATADIR)/mappings
+UCMCONFDIR=$(CONFDIR)/mappings
 SPREPSRCDIR=$(SRCDATADIR)/sprep
+SPREPCONFDIR=$(CONFDIR)/sprep
 COMINCDIR=$(top_srcdir)/common/unicode
 SRCLISTDEPS=Makefile $(srcdir)/Makefile.in
 BUILD_DIRS=$(OUTDIR) $(MAINBUILDDIR) $(BUILDDIR) $(CURRBLDDIR) $(LANGBLDDIR) $(REGIONBLDDIR) $(ZONEBLDDIR) $(BRKBLDDIR) $(COLBLDDIR) $(RBNFBLDDIR) $(TRANSLITBLDDIR) $(OUTTMPDIR) $(OUTTMPDIR_390STUB) $(OUTTMPDIR)/$(CURR_TREE) $(OUTTMPDIR)/$(LANG_TREE) $(OUTTMPDIR)/$(REGION_TREE) $(OUTTMPDIR)/$(ZONE_TREE) $(OUTTMPDIR)/$(COLLATION_TREE) $(OUTTMPDIR)/$(RBNF_TREE) $(OUTTMPDIR)/$(TRANSLIT_TREE) $(OUTTMPDIR)/$(BREAK_TREE)
@@ -231,7 +243,7 @@
 ## BRK files
 BREAK_TREE=brkitr
 -include $(BRKSRCDIR)/brkfiles.mk
--include $(BRKSRCDIR)/brklocal.mk
+-include $(BRKCONFDIR)/brklocal.mk
 ALL_BRK_SOURCE= $(BRK_SOURCE) $(BRK_SOURCE_LOCAL)
 BRK_FILES_SHORT=$(ALL_BRK_SOURCE:%.txt=$(BREAK_TREE)/%.brk)
 BRK_FILES=$(ALL_BRK_SOURCE:%.txt=$(BRKBLDDIR)/%.brk)
@@ -255,7 +267,7 @@
 -include $(UCMSRCDIR)/ucmcore.mk
 -include $(UCMSRCDIR)/ucmfiles.mk
 -include $(UCMSRCDIR)/ucmebcdic.mk
--include $(UCMSRCDIR)/ucmlocal.mk
+-include $(UCMCONFDIR)/ucmlocal.mk
 ALL_UCM_SOURCE=ibm-37_P100-1995.ucm ibm-1047_P100-1995.ucm $(UCM_SOURCE_CORE) $(UCM_SOURCE_FILES) $(UCM_SOURCE_EBCDIC) $(UCM_SOURCE_LOCAL)
 UCM_FILES = $(ALL_UCM_SOURCE:%=$(SRCDATADIR)/%)
 CNV_FILES = $(ALL_UCM_SOURCE:%.ucm=$(BUILDDIR)/%.cnv)
@@ -274,15 +286,15 @@
 -include $(COLSRCDIR)/colfiles.mk
 -include $(RBNFSRCDIR)/rbnffiles.mk
 -include $(TRANSLITSRCDIR)/trnsfiles.mk
--include $(LOCSRCDIR)/reslocal.mk
--include $(CURRSRCDIR)/reslocal.mk
--include $(LANGSRCDIR)/reslocal.mk
--include $(REGIONSRCDIR)/reslocal.mk
--include $(ZONESRCDIR)/reslocal.mk
--include $(COLSRCDIR)/collocal.mk
--include $(BRKSRCDIR)/brslocal.mk
--include $(RBNFSRCDIR)/rbnflocal.mk
--include $(TRANSLITSRCDIR)/trnslocal.mk
+-include $(LOCCONFDIR)/reslocal.mk
+-include $(CURRCONFDIR)/reslocal.mk
+-include $(LANGCONFDIR)/reslocal.mk
+-include $(REGIONCONFDIR)/reslocal.mk
+-include $(ZONECONFDIR)/reslocal.mk
+-include $(COLCONFDIR)/collocal.mk
+-include $(BRKCONFDIR)/brslocal.mk
+-include $(RBNFCONFDIR)/rbnflocal.mk
+-include $(TRANSLITCONFDIR)/trnslocal.mk
 ifdef GENRB_SOURCE
 RES_SRC= root.txt $(GENRB_SOURCE) $(GENRB_ALIAS_SOURCE) $(GENRB_SOURCE_LOCAL) $(GENRB_ALIAS_SOURCE_LOCAL)
 RES_SRC_FILES = $(RES_SRC:%=$(LOCSRCDIR)/%)
@@ -327,7 +339,7 @@
 
 ## MISC files
 -include $(MISCSRCDIR)/miscfiles.mk
--include $(MISCSRCDIR)/misclocal.mk
+-include $(MISCCONFDIR)/misclocal.mk
 MSC_SOURCE= $(MISC_SOURCE) $(MISC_SOURCE_LOCAL)
 MSC_SRC_FILES=$(MSC_SOURCE:%=$(MISCSRCDIR)/%)
 
@@ -396,7 +408,7 @@
 
 ## SPP files
 -include $(SPREPSRCDIR)/sprepfiles.mk
--include $(SPREPSRCDIR)/spreplocal.mk
+-include $(SPREPCONFDIR)/spreplocal.mk
 ALL_SPREP_SOURCE=$(SPREP_SOURCE) $(SPREP_SOURCE_LOCAL)
 SPREP_FILES = $(ALL_SPREP_SOURCE:%.txt=$(BUILDDIR)/%.spp)
 SPREP_FILES_SHORT = $(ALL_SPREP_SOURCE:%.txt=%.spp)