diff --git a/icu4c/source/data/Makefile.in b/icu4c/source/data/Makefile.in
index 433a87867eb..a1479eefdd8 100644
--- a/icu4c/source/data/Makefile.in
+++ b/icu4c/source/data/Makefile.in
@@ -76,7 +76,11 @@ all-recursive install-recursive clean-recursive distclean-recursive dist-recursi
 	  $(MAKE) "$$target-local" || exit; \
 	fi
 
-all-local: packagedata testdata packagetest
+ifeq ($(OS390BATCH),1)
+OS390PKG= package390
+endif
+
+all-local: packagedata testdata packagetest $(OS390PKG)
 
 
 
@@ -124,4 +128,11 @@ testdata: $(SPECIALTESTDATA)
 %.cnv: build/%.cnv
 	ln -sf $< .
 
-#
+###################
+###################
+################### 390 support
+package390: build/icudata390.lst build/icudata.lst $(top_builddir)/tools/pkgdata/icupkg.inc
+	@$(MKINSTALLDIRS) tmp390A
+	@$(MKINSTALLDIRS) tmp3901
+	( cd build ; $(INVOKE) $(PKGDATA) -s . -T ../tmp390A -p IXMICUDA icudata.lst )
+	( cd build ; $(INVOKE) $(PKGDATA) -s . -T ../tmp3901 -p IXMICUD1 icudata390.lst )
diff --git a/icu4c/source/data/build/Makefile.in b/icu4c/source/data/build/Makefile.in
index f099912cd26..fedfd55345d 100644
--- a/icu4c/source/data/build/Makefile.in
+++ b/icu4c/source/data/build/Makefile.in
@@ -111,7 +111,13 @@ $(TESTOBJDATADIR)/testdata.lst: $(SRCLISTDEPS)
 
 build-local: build-data build-testdata
 
-build-data: $(ALL_FILES) icudata.lst
+# Additional data for 390
+ifeq ($(OS390BATCH),1)
+OS390LIST= icudata390.lst
+endif
+#
+
+build-data: $(ALL_FILES) icudata.lst  $(OS390LIST)
 	@echo "ICU data files are up to date."
 
 clean-local:
@@ -194,7 +200,14 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
+###########
+########### 390 support
+UCMFILES390=ebcdic-xml-us.ucm ibm-37-s390.ucm ibm-1047-s390.ucm ibm-4909.ucm
+ALLFILES390=uprops.dat cnvalias.dat $(UCMFILES390:.ucm=.cnv)
 
-
-
-
+icudata390.lst:  $(SRCLISTDEPS)
+	@echo Generating $@ list of 390 data files
+	@-$(RMV) $@
+	@for file in $(ALLFILES390); do \
+	  echo $$file >> $@; \
+	done;