diff --git a/.gitignore b/.gitignore
index 6e00487d67d..c04f32dfdd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,15 +3,21 @@ icu4c/bin
 icu4c/build
 icu4c/data/*.cnv
 icu4c/data/*.dat
+icu4c/data/*.exp
+icu4c/data/*.lib
 icu4c/data/*.lst
+icu4c/data/*.mak
 icu4c/data/*.res
 icu4c/data/char.brk
 icu4c/data/icudata.dll
+icu4c/data/icudt*.*
 icu4c/data/icupkg.inc
 icu4c/data/libicudata*
 icu4c/data/line.brk
 icu4c/data/line_th.brk
+icu4c/data/pkgdatain.txt
 icu4c/data/sent.brk
+icu4c/data/testdat*.*
 icu4c/data/word.brk
 icu4c/data/word_th.brk
 icu4c/debian
@@ -59,6 +65,29 @@ icu4c/source/data/*.obj
 icu4c/source/data/*.res
 icu4c/source/data/.links
 icu4c/source/data/Makefile
+icu4c/source/data/build/*.a
+icu4c/source/data/build/*.cnv
+icu4c/source/data/build/*.dat
+icu4c/source/data/build/*.lst
+icu4c/source/data/build/*.ncb
+icu4c/source/data/build/*.opt
+icu4c/source/data/build/*.plg
+icu4c/source/data/build/*.res
+icu4c/source/data/build/*.so
+icu4c/source/data/build/Debug
+icu4c/source/data/build/Makefile
+icu4c/source/data/build/Release
+icu4c/source/data/build/char.brk
+icu4c/source/data/build/icu*.mak
+icu4c/source/data/build/icudata.dll
+icu4c/source/data/build/icupkg.inc
+icu4c/source/data/build/libicudata*
+icu4c/source/data/build/line.brk
+icu4c/source/data/build/line_th.brk
+icu4c/source/data/build/pkgdatain.txt
+icu4c/source/data/build/sent.brk
+icu4c/source/data/build/word.brk
+icu4c/source/data/build/word_th.brk
 icu4c/source/extra/Makefile
 icu4c/source/extra/ustdio/*.d
 icu4c/source/extra/ustdio/Debug
diff --git a/icu4c/data/.cvsignore b/icu4c/data/.cvsignore
index 299ca88e81d..a16a261387a 100644
--- a/icu4c/data/.cvsignore
+++ b/icu4c/data/.cvsignore
@@ -11,3 +11,10 @@ line_th.brk
 sent.brk
 word.brk
 word_th.brk
+icudt*.*
+testdat*.*
+pkgdatain.txt
+*.lib
+*.exp
+*.mak
+
diff --git a/icu4c/source/data/build/.cvsignore b/icu4c/source/data/build/.cvsignore
new file mode 100644
index 00000000000..ce9038a8bb7
--- /dev/null
+++ b/icu4c/source/data/build/.cvsignore
@@ -0,0 +1,23 @@
+Makefile
+*.so
+*.opt
+*.ncb
+*.a
+Debug
+Release
+*.cnv
+icu*.mak
+pkgdatain.txt
+*.plg
+*.dat
+*.lst
+*.res
+icupkg.inc
+char.brk
+icudata.dll
+libicudata*
+line.brk
+line_th.brk
+sent.brk
+word.brk
+word_th.brk
diff --git a/icu4c/source/data/build/makedata.bat b/icu4c/source/data/build/makedata.bat
new file mode 100755
index 00000000000..36fdd62a9af
--- /dev/null
+++ b/icu4c/source/data/build/makedata.bat
@@ -0,0 +1,33 @@
+@echo off
+rem makedata.bat
+rem batch file for Windows for creating the ICU data files
+rem parameter:
+rem %1 path where the icu folder resides
+
+if "%1"=="" goto :error
+
+if "%ICU_DATA%"=="" set ICU_DATA=%1\data\
+
+rem toolversion: Debug or Release
+set toolversion=Release
+if not "%2"=="" set toolversion=%2
+
+nmake /f makedata.mak icup=%1 cfg=%2 %3 %4
+if not errorlevel 9009 goto :othererror
+echo Build tools are not on path! Please make sure that MSVC++ is setup correctly!
+goto :error
+:othererror
+if errorlevel 0 goto :end
+echo Nmake has unsuccesfully finished with errorcode %errorlevel%!
+goto :end
+
+:error
+echo call makedata with the absolute path to the icu directory
+echo for example, if the full path is d:\mytools\icu then call
+echo makedata d:\mytools\icu
+echo a second, optional, parameter can be Debug or Release to specify the tools versions
+echo.
+echo the current directory must be the icu\source\tools directory with makedata.bat
+echo also, the cl compiler and link linker must be on the PATH
+
+:end
diff --git a/icu4c/source/data/build/makedata.dsp b/icu4c/source/data/build/makedata.dsp
new file mode 100644
index 00000000000..c4dd8bbc2e9
--- /dev/null
+++ b/icu4c/source/data/build/makedata.dsp
@@ -0,0 +1,109 @@
+# Microsoft Developer Studio Project File - Name="makedata" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=makedata - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "makedata.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "makedata.mak" CFG="makedata - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "makedata - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "makedata - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "makedata - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /f makedata.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makedata.exe"
+# PROP BASE Bsc_Name "makedata.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "NMAKE /f makedata.mak icudbld=$(MAKEDIR)  icup=$(MAKEDIR)\..\..\.. cfg=release"
+# PROP Rebuild_Opt "clean all"
+# PROP Target_File "makedata.exe"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "makedata - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /f makedata.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makedata.exe"
+# PROP BASE Bsc_Name "makedata.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "NMAKE /f makedata.mak icudbld=$(MAKEDIR) icup=$(MAKEDIR)\..\..\.. cfg=debug"
+# PROP Rebuild_Opt "clean all"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ENDIF 
+
+# Begin Target
+
+# Name "makedata - Win32 Release"
+# Name "makedata - Win32 Debug"
+
+!IF  "$(CFG)" == "makedata - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "makedata - Win32 Debug"
+
+!ENDIF 
+
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\makedata.mak
+# PROP Intermediate_Dir "..\..\data\*.obj"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\data\resfiles.mk
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\data\ucmfiles.mk
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/icu4c/source/data/build/makedata.dsw b/icu4c/source/data/build/makedata.dsw
new file mode 100644
index 00000000000..5205a3c8ccf
--- /dev/null
+++ b/icu4c/source/data/build/makedata.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "makedata"=.\makedata.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/icu4c/source/data/build/makedata.mak b/icu4c/source/data/build/makedata.mak
new file mode 100644
index 00000000000..d17da7e2941
--- /dev/null
+++ b/icu4c/source/data/build/makedata.mak
@@ -0,0 +1,279 @@
+#**********************************************************************
+#* Copyright (C) 1999-2000, International Business Machines Corporation
+#* and others.  All Rights Reserved.
+#**********************************************************************
+# nmake file for creating data files on win32
+# invoke with
+# nmake /f makedata.mak icup=<path_to_icu_instalation> [Debug|Release]
+#
+#	12/10/1999	weiv	Created
+
+U_ICUDATA_NAME=icudt17l
+
+#If no config, we default to debug
+!IF "$(CFG)" == ""
+CFG=Debug
+!MESSAGE No configuration specified. Defaulting to common - Win32 Debug.
+!ENDIF
+
+#Here we test if a valid configuration is given
+!IF "$(CFG)" != "Release" && "$(CFG)" != "release" && "$(CFG)" != "Debug" && "$(CFG)" != "debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "makedata.mak" CFG="Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Release"
+!MESSAGE "Debug"
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+#Let's see if user has given us a path to ICU
+#This could be found according to the path to makefile, but for now it is this way
+!IF "$(ICUP)"==""
+!ERROR Can't find path!
+!ENDIF
+!MESSAGE icu path is $(ICUP)
+ICUDATA=$(ICUP)\data
+
+!IF "$(ICUDBLD)"==""
+!ERROR Can't find ICUDBLD (ICU Data Build dir, should point to icu\source\data\build\ )!
+!ENDIF
+!MESSAGE icu data build path is $(ICUDBLD)
+
+#ICUDBLD=$(ICUP)\source\data\build
+
+TESTDATA=$(ICUP)\source\test\testdata
+
+#If ICU_DATA is not set, we want to output stuff in binary directory
+DLL_OUTPUT=$(ICUP)\source\data
+TESTDATAOUT=$(TESTDATA)
+#TESTDATAOUT=$(DLL_OUTPUT)
+
+
+ICD=$(ICUDATA)^\
+DATA_PATH=$(ICUP)\data^\
+TEST=..\source\test\testdata^\
+ICUTOOLS=$(ICUP)\source\tools
+
+ICU_DATA=$(ICUDBLD)
+!MESSAGE Intermediate files will go in $(ICU_DATA)
+
+# We have to prepare params for pkgdata - to help it find the tools
+!IF "$(CFG)" == "Debug" || "$(CFG)" == "debug"
+PKGOPT=D:$(ICUP)
+!ELSE
+PKGOPT=R:$(ICUP)
+!ENDIF
+
+# This appears in original Microsofts makefiles
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+# Adjust the path to find DLLs. If $(U_ICUDATA_NAME).dll really needs to be in $(ICUP)\bin\$(CFG),
+# then add $(ICUP)\bin\$(CFG) to this path, as the other DLLs are in $(ICUP)\bin.
+PATH = $(PATH);$(ICUP)\bin
+
+# Suffixes for data files
+.SUFFIXES : .ucm .cnv .dll .dat .res .txt .c
+
+# We're including a list of ucm files. There are two lists, one is essential 'ucmfiles.mk' and
+# the other is optional 'ucmlocal.mk'
+!IF EXISTS("$(ICUDATA)\ucmfiles.mk")
+!INCLUDE "$(ICUDATA)\ucmfiles.mk"
+!IF EXISTS("$(ICUDATA)\ucmlocal.mk")
+!INCLUDE "$(ICUDATA)\ucmlocal.mk"
+$(UCM_SOURCE)=$(UCM_SOURCE) $(UCM_SOURCE_LOCAL)
+!ELSE
+#!MESSAGE Warning: cannot find "ucmlocal.mk"
+!ENDIF
+!ELSE
+!ERROR ERROR: cannot find "ucmfiles.mk"
+!ENDIF
+CNV_FILES=$(UCM_SOURCE:.ucm=.cnv)
+
+# Read list of resource bundle files
+!IF EXISTS("$(ICUDATA)\resfiles.mk")
+!INCLUDE "$(ICUDATA)\resfiles.mk"
+!IF EXISTS("$(ICUDATA)\reslocal.mk")
+!INCLUDE "$(ICUDATA)\reslocal.mk"
+GENRB_SOURCE=$(GENRB_SOURCE) $(GENRB_SOURCE_LOCAL)
+!ELSE
+#!MESSAGE Warning: cannot find "reslocal.mk"
+!ENDIF
+!ELSE
+!ERROR ERROR: cannot find "resfiles.mk"
+!ENDIF
+RB_FILES = $(GENRB_SOURCE:.txt=.res)
+TRANSLIT_FILES = $(TRANSLIT_SOURCE:.txt=.res)
+ALL_RES = $(RB_FILES) $(TRANSLIT_FILES)
+
+RB_SOURCE_DIR = $(GENRB_SOURCE:$=$)
+
+# This target should build all the data files
+ALL : GODATA  test.dat  "$(DLL_OUTPUT)\testdata.dll" "$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" $(DLL_OUTPUT)\test1.cnv $(DLL_OUTPUT)\test3.cnv $(DLL_OUTPUT)\test4.cnv GOBACK #$(U_ICUDATA_NAME).dat
+	@echo All targets are up to date
+
+BRK_FILES = "$(ICUDATA)\sent.brk" "$(ICUDATA)\char.brk" "$(ICUDATA)\line.brk" "$(ICUDATA)\word.brk" "$(ICUDATA)\line_th.brk" "$(ICUDATA)\word_th.brk"
+
+#invoke pkgdata
+"$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" :  $(CNV_FILES) $(BRK_FILES) uprops.dat unames.dat cnvalias.dat tz.dat $(ALL_RES) 
+	@echo Building icu data
+ 	"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -v -T . -m dll -c -p $(U_ICUDATA_NAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s . <<pkgdatain.txt
+uprops.dat
+unames.dat
+cnvalias.dat
+tz.dat
+$(CNV_FILES:.cnv =.cnv
+)
+$(RB_FILES:.res =.res
+)
+$(TRANSLIT_FILES:.res =.res
+)
+$(BRK_FILES:.brk" =.brk"
+)
+<<KEEP
+
+"$(DLL_OUTPUT)\testdata.dll" :  "$(TESTDATA)\root.res" "$(TESTDATA)\te.res" "$(TESTDATA)\te_IN.res" "$(TESTDATA)\testtypes.res" test.dat
+	@echo Building test data
+	@copy test.dat $(TESTDATAOUT)
+ 	@"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -v -m dll -c -p testdata -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -T "$(TESTDATAOUT)" -s "$(TESTDATA)" <<
+root.res
+te.res
+te_IN.res
+testtypes.res
+test.dat
+<<
+
+# Targets for test.dat
+test.dat :
+	@echo Creating data file for test: $(ICUDATA) $(ICUP)
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\gentest\$(CFG)\gentest"
+
+"$(ICUDATA)\sent.brk" : "$(ICUDATA)\sentLE.brk"
+    copy "$(ICUDATA)\sentLE.brk" "$(ICUDATA)\sent.brk"
+
+"$(ICUDATA)\char.brk" : "$(ICUDATA)\charLE.brk"
+    copy "$(ICUDATA)\charLE.brk" "$(ICUDATA)\char.brk"
+
+"$(ICUDATA)\line.brk" : "$(ICUDATA)\lineLE.brk"
+    copy "$(ICUDATA)\lineLE.brk" "$(ICUDATA)\line.brk"
+
+"$(ICUDATA)\word.brk" : "$(ICUDATA)\wordLE.brk"
+    copy "$(ICUDATA)\wordLE.brk" "$(ICUDATA)\word.brk"
+
+"$(ICUDATA)\line_th.brk" : "$(ICUDATA)\line_thLE.brk"
+    copy "$(ICUDATA)\line_thLE.brk" "$(ICUDATA)\line_th.brk"
+
+"$(ICUDATA)\word_th.brk" : "$(ICUDATA)\word_thLE.brk"
+    copy "$(ICUDATA)\word_thLE.brk" "$(ICUDATA)\word_th.brk"
+
+# utility to send us to the right dir
+GODATA :
+	@cd "$(ICUDBLD)"
+
+# utility to get us back to the right dir
+GOBACK :
+	@cd "$(ICUDBLD)"
+
+# This is to remove all the data files
+CLEAN :
+	@cd "$(ICUDBLD)"
+	-@erase "*.cnv"
+	-@erase "*.res"
+	-@erase "$(TRANS)*.res"
+	-@erase "uprops*.*"
+	-@erase "unames*.*"
+	-@erase "cnvalias*.*"
+	-@erase "tz*.*"
+	-@erase "ibm*_cnv.c"
+	-@erase "*_brk.c"
+	-@erase "icudt*.*"
+	-@erase "*.obj"
+	-@erase "sent.brk"
+	-@erase "char.brk"
+	-@erase "line.brk"
+	-@erase "word.brk"
+	-@erase "line_th.brk"
+	-@erase "word_th.brk"
+	-@erase "test*.*"
+	-@erase "base*.*"
+	@cd $(TEST)
+	-@erase "*.res"
+	@cd "$(ICUTOOLS)"
+
+# Inference rule for creating resource bundles
+{"$(ICUDATA)"}.txt{.}.res:
+	@echo Making Resource Bundle files
+	@"$(ICUTOOLS)\genrb\$(CFG)\genrb" -s$(ICUDATA) -d$(@D) $(?F)
+	@echo FILE is $(?F) 
+
+# Inference rule for creating converters, with a kludge to create
+# c versions of converters at the same time
+{"$(ICUDATA)"}.ucm{.}.cnv:
+	@echo Generating converters and c source files
+	@cd "$(ICUDATA)"
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" $<
+
+# Targets for test converter data
+$(DLL_OUTPUT)\test1.cnv: "$(TESTDATA)\test1.ucm"
+	@cd "$(ICUDATA)"
+	@set ICU_DATA=$(DLL_OUTPUT)
+	@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" $**
+
+$(DLL_OUTPUT)\test3.cnv: "$(TESTDATA)\test3.ucm"
+	@cd "$(ICUDATA)"
+	@set ICU_DATA=$(DLL_OUTPUT)
+	@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" $**
+
+$(DLL_OUTPUT)\test4.cnv: "$(TESTDATA)\test4.ucm"
+	@cd "$(ICUDATA)"
+	@set ICU_DATA=$(DLL_OUTPUT)
+	@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" $**
+
+# Targets for unames.dat
+unames.dat: {"$(ICUDATA)"}\unidata\UnicodeData.txt "$(ICUTOOLS)\gennames\$(CFG)\gennames.exe"
+	@echo Creating data file for Unicode Names
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\gennames\$(CFG)\gennames" $(ICUDATA)\unidata\UnicodeData.txt
+
+# Targets for uprops.dat
+uprops.dat: "$(ICUDATA)\unidata\UnicodeData.txt" "$(ICUTOOLS)\genprops\$(CFG)\genprops.exe"
+	@echo Creating data file for Unicode Character Properties
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\genprops\$(CFG)\genprops" -s "$(ICUDATA)\unidata"
+
+# Targets for converters
+cnvalias.dat : {"$(ICUDATA)"}\convrtrs.txt "$(ICUTOOLS)\gencnval\$(CFG)\gencnval.exe"
+	@echo Creating data file for Converter Aliases
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\gencnval\$(CFG)\gencnval" $(ICUDATA)\convrtrs.txt
+
+# Targets for tz
+tz.dat : {"$(ICUDATA)"}timezone.txt {"$(ICUTOOLS)\gentz\$(CFG)"}gentz.exe
+	@echo Creating data file for Timezones
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\gentz\$(CFG)\gentz" "$(ICUDATA)\timezone.txt"
+
+# Dependencies on the tools
+convrtrs.txt : {"$(ICUTOOLS)\gencnval\$(CFG)"}gencnval.exe
+
+tz.txt : {"$(ICUTOOLS)\gentz\$(CFG)"}gentz.exe
+
+uprops.dat unames.dat cnvalias.dat tz.dat : {"$(ICUTOOLS)\genccode\$(CFG)"}genccode.exe
+
+$(TRANSLIT_SOURCE) $(GENRB_SOURCE) : {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe
+
+$(UCM_SOURCE) : {"$(ICUTOOLS)\makeconv\$(CFG)"}makeconv.exe {"$(ICUTOOLS)\genccode\$(CFG)"}genccode.exe
+
+test.dat : {"$(ICUTOOLS)\gentest\$(CFG)"}gentest.exe
+
diff --git a/icu4c/source/data/build/mkdll.lk b/icu4c/source/data/build/mkdll.lk
new file mode 100644
index 00000000000..6bc6587f2ad
--- /dev/null
+++ b/icu4c/source/data/build/mkdll.lk
@@ -0,0 +1,4 @@
+/DLL
+/NOENTRY
+/base:"0x4ad00000"
+/comment:" Copyright (C) 1999 International Business Machines Corporation and others.  All Rights Reserved. "
diff --git a/icu4c/source/data/build/mkobj.cl b/icu4c/source/data/build/mkobj.cl
new file mode 100644
index 00000000000..9b322be3b00
--- /dev/null
+++ b/icu4c/source/data/build/mkobj.cl
@@ -0,0 +1,3 @@
+"/I..\..\include"
+/GD
+/c
diff --git a/icu4c/source/data/makedata.bat b/icu4c/source/data/makedata.bat
new file mode 100755
index 00000000000..36fdd62a9af
--- /dev/null
+++ b/icu4c/source/data/makedata.bat
@@ -0,0 +1,33 @@
+@echo off
+rem makedata.bat
+rem batch file for Windows for creating the ICU data files
+rem parameter:
+rem %1 path where the icu folder resides
+
+if "%1"=="" goto :error
+
+if "%ICU_DATA%"=="" set ICU_DATA=%1\data\
+
+rem toolversion: Debug or Release
+set toolversion=Release
+if not "%2"=="" set toolversion=%2
+
+nmake /f makedata.mak icup=%1 cfg=%2 %3 %4
+if not errorlevel 9009 goto :othererror
+echo Build tools are not on path! Please make sure that MSVC++ is setup correctly!
+goto :error
+:othererror
+if errorlevel 0 goto :end
+echo Nmake has unsuccesfully finished with errorcode %errorlevel%!
+goto :end
+
+:error
+echo call makedata with the absolute path to the icu directory
+echo for example, if the full path is d:\mytools\icu then call
+echo makedata d:\mytools\icu
+echo a second, optional, parameter can be Debug or Release to specify the tools versions
+echo.
+echo the current directory must be the icu\source\tools directory with makedata.bat
+echo also, the cl compiler and link linker must be on the PATH
+
+:end
diff --git a/icu4c/source/data/makedata.dsp b/icu4c/source/data/makedata.dsp
new file mode 100644
index 00000000000..c4dd8bbc2e9
--- /dev/null
+++ b/icu4c/source/data/makedata.dsp
@@ -0,0 +1,109 @@
+# Microsoft Developer Studio Project File - Name="makedata" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) External Target" 0x0106
+
+CFG=makedata - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "makedata.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "makedata.mak" CFG="makedata - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "makedata - Win32 Release" (based on "Win32 (x86) External Target")
+!MESSAGE "makedata - Win32 Debug" (based on "Win32 (x86) External Target")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+
+!IF  "$(CFG)" == "makedata - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "Release"
+# PROP BASE Intermediate_Dir "Release"
+# PROP BASE Cmd_Line "NMAKE /f makedata.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makedata.exe"
+# PROP BASE Bsc_Name "makedata.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release"
+# PROP Intermediate_Dir "Release"
+# PROP Cmd_Line "NMAKE /f makedata.mak icudbld=$(MAKEDIR)  icup=$(MAKEDIR)\..\..\.. cfg=release"
+# PROP Rebuild_Opt "clean all"
+# PROP Target_File "makedata.exe"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ELSEIF  "$(CFG)" == "makedata - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "Debug"
+# PROP BASE Intermediate_Dir "Debug"
+# PROP BASE Cmd_Line "NMAKE /f makedata.mak"
+# PROP BASE Rebuild_Opt "/a"
+# PROP BASE Target_File "makedata.exe"
+# PROP BASE Bsc_Name "makedata.bsc"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug"
+# PROP Intermediate_Dir "Debug"
+# PROP Cmd_Line "NMAKE /f makedata.mak icudbld=$(MAKEDIR) icup=$(MAKEDIR)\..\..\.. cfg=debug"
+# PROP Rebuild_Opt "clean all"
+# PROP Bsc_Name ""
+# PROP Target_Dir ""
+
+!ENDIF 
+
+# Begin Target
+
+# Name "makedata - Win32 Release"
+# Name "makedata - Win32 Debug"
+
+!IF  "$(CFG)" == "makedata - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "makedata - Win32 Debug"
+
+!ENDIF 
+
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# Begin Source File
+
+SOURCE=.\makedata.mak
+# PROP Intermediate_Dir "..\..\data\*.obj"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\data\resfiles.mk
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\data\ucmfiles.mk
+# End Source File
+# End Group
+# End Target
+# End Project
diff --git a/icu4c/source/data/makedata.dsw b/icu4c/source/data/makedata.dsw
new file mode 100644
index 00000000000..5205a3c8ccf
--- /dev/null
+++ b/icu4c/source/data/makedata.dsw
@@ -0,0 +1,29 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "makedata"=.\makedata.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak
new file mode 100644
index 00000000000..d17da7e2941
--- /dev/null
+++ b/icu4c/source/data/makedata.mak
@@ -0,0 +1,279 @@
+#**********************************************************************
+#* Copyright (C) 1999-2000, International Business Machines Corporation
+#* and others.  All Rights Reserved.
+#**********************************************************************
+# nmake file for creating data files on win32
+# invoke with
+# nmake /f makedata.mak icup=<path_to_icu_instalation> [Debug|Release]
+#
+#	12/10/1999	weiv	Created
+
+U_ICUDATA_NAME=icudt17l
+
+#If no config, we default to debug
+!IF "$(CFG)" == ""
+CFG=Debug
+!MESSAGE No configuration specified. Defaulting to common - Win32 Debug.
+!ENDIF
+
+#Here we test if a valid configuration is given
+!IF "$(CFG)" != "Release" && "$(CFG)" != "release" && "$(CFG)" != "Debug" && "$(CFG)" != "debug"
+!MESSAGE Invalid configuration "$(CFG)" specified.
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE
+!MESSAGE NMAKE /f "makedata.mak" CFG="Debug"
+!MESSAGE
+!MESSAGE Possible choices for configuration are:
+!MESSAGE
+!MESSAGE "Release"
+!MESSAGE "Debug"
+!MESSAGE
+!ERROR An invalid configuration is specified.
+!ENDIF
+
+#Let's see if user has given us a path to ICU
+#This could be found according to the path to makefile, but for now it is this way
+!IF "$(ICUP)"==""
+!ERROR Can't find path!
+!ENDIF
+!MESSAGE icu path is $(ICUP)
+ICUDATA=$(ICUP)\data
+
+!IF "$(ICUDBLD)"==""
+!ERROR Can't find ICUDBLD (ICU Data Build dir, should point to icu\source\data\build\ )!
+!ENDIF
+!MESSAGE icu data build path is $(ICUDBLD)
+
+#ICUDBLD=$(ICUP)\source\data\build
+
+TESTDATA=$(ICUP)\source\test\testdata
+
+#If ICU_DATA is not set, we want to output stuff in binary directory
+DLL_OUTPUT=$(ICUP)\source\data
+TESTDATAOUT=$(TESTDATA)
+#TESTDATAOUT=$(DLL_OUTPUT)
+
+
+ICD=$(ICUDATA)^\
+DATA_PATH=$(ICUP)\data^\
+TEST=..\source\test\testdata^\
+ICUTOOLS=$(ICUP)\source\tools
+
+ICU_DATA=$(ICUDBLD)
+!MESSAGE Intermediate files will go in $(ICU_DATA)
+
+# We have to prepare params for pkgdata - to help it find the tools
+!IF "$(CFG)" == "Debug" || "$(CFG)" == "debug"
+PKGOPT=D:$(ICUP)
+!ELSE
+PKGOPT=R:$(ICUP)
+!ENDIF
+
+# This appears in original Microsofts makefiles
+!IF "$(OS)" == "Windows_NT"
+NULL=
+!ELSE
+NULL=nul
+!ENDIF
+
+# Adjust the path to find DLLs. If $(U_ICUDATA_NAME).dll really needs to be in $(ICUP)\bin\$(CFG),
+# then add $(ICUP)\bin\$(CFG) to this path, as the other DLLs are in $(ICUP)\bin.
+PATH = $(PATH);$(ICUP)\bin
+
+# Suffixes for data files
+.SUFFIXES : .ucm .cnv .dll .dat .res .txt .c
+
+# We're including a list of ucm files. There are two lists, one is essential 'ucmfiles.mk' and
+# the other is optional 'ucmlocal.mk'
+!IF EXISTS("$(ICUDATA)\ucmfiles.mk")
+!INCLUDE "$(ICUDATA)\ucmfiles.mk"
+!IF EXISTS("$(ICUDATA)\ucmlocal.mk")
+!INCLUDE "$(ICUDATA)\ucmlocal.mk"
+$(UCM_SOURCE)=$(UCM_SOURCE) $(UCM_SOURCE_LOCAL)
+!ELSE
+#!MESSAGE Warning: cannot find "ucmlocal.mk"
+!ENDIF
+!ELSE
+!ERROR ERROR: cannot find "ucmfiles.mk"
+!ENDIF
+CNV_FILES=$(UCM_SOURCE:.ucm=.cnv)
+
+# Read list of resource bundle files
+!IF EXISTS("$(ICUDATA)\resfiles.mk")
+!INCLUDE "$(ICUDATA)\resfiles.mk"
+!IF EXISTS("$(ICUDATA)\reslocal.mk")
+!INCLUDE "$(ICUDATA)\reslocal.mk"
+GENRB_SOURCE=$(GENRB_SOURCE) $(GENRB_SOURCE_LOCAL)
+!ELSE
+#!MESSAGE Warning: cannot find "reslocal.mk"
+!ENDIF
+!ELSE
+!ERROR ERROR: cannot find "resfiles.mk"
+!ENDIF
+RB_FILES = $(GENRB_SOURCE:.txt=.res)
+TRANSLIT_FILES = $(TRANSLIT_SOURCE:.txt=.res)
+ALL_RES = $(RB_FILES) $(TRANSLIT_FILES)
+
+RB_SOURCE_DIR = $(GENRB_SOURCE:$=$)
+
+# This target should build all the data files
+ALL : GODATA  test.dat  "$(DLL_OUTPUT)\testdata.dll" "$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" $(DLL_OUTPUT)\test1.cnv $(DLL_OUTPUT)\test3.cnv $(DLL_OUTPUT)\test4.cnv GOBACK #$(U_ICUDATA_NAME).dat
+	@echo All targets are up to date
+
+BRK_FILES = "$(ICUDATA)\sent.brk" "$(ICUDATA)\char.brk" "$(ICUDATA)\line.brk" "$(ICUDATA)\word.brk" "$(ICUDATA)\line_th.brk" "$(ICUDATA)\word_th.brk"
+
+#invoke pkgdata
+"$(DLL_OUTPUT)\$(U_ICUDATA_NAME).dll" :  $(CNV_FILES) $(BRK_FILES) uprops.dat unames.dat cnvalias.dat tz.dat $(ALL_RES) 
+	@echo Building icu data
+ 	"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -v -T . -m dll -c -p $(U_ICUDATA_NAME) -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -s . <<pkgdatain.txt
+uprops.dat
+unames.dat
+cnvalias.dat
+tz.dat
+$(CNV_FILES:.cnv =.cnv
+)
+$(RB_FILES:.res =.res
+)
+$(TRANSLIT_FILES:.res =.res
+)
+$(BRK_FILES:.brk" =.brk"
+)
+<<KEEP
+
+"$(DLL_OUTPUT)\testdata.dll" :  "$(TESTDATA)\root.res" "$(TESTDATA)\te.res" "$(TESTDATA)\te_IN.res" "$(TESTDATA)\testtypes.res" test.dat
+	@echo Building test data
+	@copy test.dat $(TESTDATAOUT)
+ 	@"$(ICUTOOLS)\pkgdata\$(CFG)\pkgdata" -v -m dll -c -p testdata -O "$(PKGOPT)" -d "$(DLL_OUTPUT)" -T "$(TESTDATAOUT)" -s "$(TESTDATA)" <<
+root.res
+te.res
+te_IN.res
+testtypes.res
+test.dat
+<<
+
+# Targets for test.dat
+test.dat :
+	@echo Creating data file for test: $(ICUDATA) $(ICUP)
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\gentest\$(CFG)\gentest"
+
+"$(ICUDATA)\sent.brk" : "$(ICUDATA)\sentLE.brk"
+    copy "$(ICUDATA)\sentLE.brk" "$(ICUDATA)\sent.brk"
+
+"$(ICUDATA)\char.brk" : "$(ICUDATA)\charLE.brk"
+    copy "$(ICUDATA)\charLE.brk" "$(ICUDATA)\char.brk"
+
+"$(ICUDATA)\line.brk" : "$(ICUDATA)\lineLE.brk"
+    copy "$(ICUDATA)\lineLE.brk" "$(ICUDATA)\line.brk"
+
+"$(ICUDATA)\word.brk" : "$(ICUDATA)\wordLE.brk"
+    copy "$(ICUDATA)\wordLE.brk" "$(ICUDATA)\word.brk"
+
+"$(ICUDATA)\line_th.brk" : "$(ICUDATA)\line_thLE.brk"
+    copy "$(ICUDATA)\line_thLE.brk" "$(ICUDATA)\line_th.brk"
+
+"$(ICUDATA)\word_th.brk" : "$(ICUDATA)\word_thLE.brk"
+    copy "$(ICUDATA)\word_thLE.brk" "$(ICUDATA)\word_th.brk"
+
+# utility to send us to the right dir
+GODATA :
+	@cd "$(ICUDBLD)"
+
+# utility to get us back to the right dir
+GOBACK :
+	@cd "$(ICUDBLD)"
+
+# This is to remove all the data files
+CLEAN :
+	@cd "$(ICUDBLD)"
+	-@erase "*.cnv"
+	-@erase "*.res"
+	-@erase "$(TRANS)*.res"
+	-@erase "uprops*.*"
+	-@erase "unames*.*"
+	-@erase "cnvalias*.*"
+	-@erase "tz*.*"
+	-@erase "ibm*_cnv.c"
+	-@erase "*_brk.c"
+	-@erase "icudt*.*"
+	-@erase "*.obj"
+	-@erase "sent.brk"
+	-@erase "char.brk"
+	-@erase "line.brk"
+	-@erase "word.brk"
+	-@erase "line_th.brk"
+	-@erase "word_th.brk"
+	-@erase "test*.*"
+	-@erase "base*.*"
+	@cd $(TEST)
+	-@erase "*.res"
+	@cd "$(ICUTOOLS)"
+
+# Inference rule for creating resource bundles
+{"$(ICUDATA)"}.txt{.}.res:
+	@echo Making Resource Bundle files
+	@"$(ICUTOOLS)\genrb\$(CFG)\genrb" -s$(ICUDATA) -d$(@D) $(?F)
+	@echo FILE is $(?F) 
+
+# Inference rule for creating converters, with a kludge to create
+# c versions of converters at the same time
+{"$(ICUDATA)"}.ucm{.}.cnv:
+	@echo Generating converters and c source files
+	@cd "$(ICUDATA)"
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" $<
+
+# Targets for test converter data
+$(DLL_OUTPUT)\test1.cnv: "$(TESTDATA)\test1.ucm"
+	@cd "$(ICUDATA)"
+	@set ICU_DATA=$(DLL_OUTPUT)
+	@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" $**
+
+$(DLL_OUTPUT)\test3.cnv: "$(TESTDATA)\test3.ucm"
+	@cd "$(ICUDATA)"
+	@set ICU_DATA=$(DLL_OUTPUT)
+	@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" $**
+
+$(DLL_OUTPUT)\test4.cnv: "$(TESTDATA)\test4.ucm"
+	@cd "$(ICUDATA)"
+	@set ICU_DATA=$(DLL_OUTPUT)
+	@"$(ICUTOOLS)\makeconv\$(CFG)\makeconv" $**
+
+# Targets for unames.dat
+unames.dat: {"$(ICUDATA)"}\unidata\UnicodeData.txt "$(ICUTOOLS)\gennames\$(CFG)\gennames.exe"
+	@echo Creating data file for Unicode Names
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\gennames\$(CFG)\gennames" $(ICUDATA)\unidata\UnicodeData.txt
+
+# Targets for uprops.dat
+uprops.dat: "$(ICUDATA)\unidata\UnicodeData.txt" "$(ICUTOOLS)\genprops\$(CFG)\genprops.exe"
+	@echo Creating data file for Unicode Character Properties
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\genprops\$(CFG)\genprops" -s "$(ICUDATA)\unidata"
+
+# Targets for converters
+cnvalias.dat : {"$(ICUDATA)"}\convrtrs.txt "$(ICUTOOLS)\gencnval\$(CFG)\gencnval.exe"
+	@echo Creating data file for Converter Aliases
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\gencnval\$(CFG)\gencnval" $(ICUDATA)\convrtrs.txt
+
+# Targets for tz
+tz.dat : {"$(ICUDATA)"}timezone.txt {"$(ICUTOOLS)\gentz\$(CFG)"}gentz.exe
+	@echo Creating data file for Timezones
+	@set ICU_DATA=$(ICUDBLD)
+	@"$(ICUTOOLS)\gentz\$(CFG)\gentz" "$(ICUDATA)\timezone.txt"
+
+# Dependencies on the tools
+convrtrs.txt : {"$(ICUTOOLS)\gencnval\$(CFG)"}gencnval.exe
+
+tz.txt : {"$(ICUTOOLS)\gentz\$(CFG)"}gentz.exe
+
+uprops.dat unames.dat cnvalias.dat tz.dat : {"$(ICUTOOLS)\genccode\$(CFG)"}genccode.exe
+
+$(TRANSLIT_SOURCE) $(GENRB_SOURCE) : {"$(ICUTOOLS)\genrb\$(CFG)"}genrb.exe
+
+$(UCM_SOURCE) : {"$(ICUTOOLS)\makeconv\$(CFG)"}makeconv.exe {"$(ICUTOOLS)\genccode\$(CFG)"}genccode.exe
+
+test.dat : {"$(ICUTOOLS)\gentest\$(CFG)"}gentest.exe
+
diff --git a/icu4c/source/data/mkdll.lk b/icu4c/source/data/mkdll.lk
new file mode 100644
index 00000000000..6bc6587f2ad
--- /dev/null
+++ b/icu4c/source/data/mkdll.lk
@@ -0,0 +1,4 @@
+/DLL
+/NOENTRY
+/base:"0x4ad00000"
+/comment:" Copyright (C) 1999 International Business Machines Corporation and others.  All Rights Reserved. "
diff --git a/icu4c/source/data/mkobj.cl b/icu4c/source/data/mkobj.cl
new file mode 100644
index 00000000000..9b322be3b00
--- /dev/null
+++ b/icu4c/source/data/mkobj.cl
@@ -0,0 +1,3 @@
+"/I..\..\include"
+/GD
+/c