diff --git a/.gitattributes b/.gitattributes
index 670c322041..4d7cb99e9f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -546,6 +546,7 @@ icu4j/main/tests/translit/.externalToolBuilders/copy-translit-test-data.launch -
icu4j/main/tests/translit/.settings/org.eclipse.jdt.core.prefs -text
icu4j/main/tests/translit/.settings/org.eclipse.jdt.ui.prefs -text
icu4j/main/tests/translit/translit-tests-build.launch -text
+icu4j/manifest.stub -text
icu4j/tools/build/icu4j28.api.gz -text
icu4j/tools/build/icu4j30.api.gz -text
icu4j/tools/build/icu4j32.api.gz -text
diff --git a/icu4j/build.xml b/icu4j/build.xml
index 28b8be5d21..8ec73e862b 100644
--- a/icu4j/build.xml
+++ b/icu4j/build.xml
@@ -104,6 +104,8 @@
+
+
@@ -316,11 +318,12 @@
-
+
+
@@ -367,19 +370,9 @@
-
-
-
-
-
-
-
-
-
+ compress="true">
diff --git a/icu4j/main/classes/charset/manifest.stub b/icu4j/main/classes/charset/manifest.stub
index a117a360bc..c9fa009a3a 100644
--- a/icu4j/main/classes/charset/manifest.stub
+++ b/icu4j/main/classes/charset/manifest.stub
@@ -1,11 +1,16 @@
Manifest-Version: 1.0
-
-Name: com/ibm/icu/charset
-Specification-Title: ICU4J Charset
+Specification-Title: International Components for Unicode for Java (charset)
Specification-Version: @SPECVERSION@
-Specification-Vendor: ICU
-Implementation-Title: ICU for Java Charset
+Specification-Vendor: icu-project.org
+Implementation-Title: International Components for Unicode for Java (charset)
Implementation-Version: @IMPLVERSION@
Implementation-Vendor: IBM Corporation
Implementation-Vendor-Id: com.ibm
-Copyright-Info: @COPYRIGHT@
\ No newline at end of file
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4J charset
+Bundle-Description: International Components for Unicode for Java (charset)
+Bundle-SymbolicName: com.ibm.icu.charset
+Bundle-Version: @IMPLVERSION@
+Bundle-Vendor: IBM Corporation
+Bundle-Copyright: @COPYRIGHT@
+Bundle-RequiredExecutionEnvironment: @EXECENV@
diff --git a/icu4j/main/classes/collate/manifest.stub b/icu4j/main/classes/collate/manifest.stub
index 2a404305ea..20790b5efa 100644
--- a/icu4j/main/classes/collate/manifest.stub
+++ b/icu4j/main/classes/collate/manifest.stub
@@ -1,11 +1,16 @@
Manifest-Version: 1.0
-
-Name: com/ibm/icu/text
-Specification-Title: ICU for Java Collation
+Specification-Title: International Components for Unicode for Java (collate)
Specification-Version: @SPECVERSION@
-Specification-Vendor: ICU
-Implementation-Title: ICU for Java Collation
+Specification-Vendor: icu-project.org
+Implementation-Title: International Components for Unicode for Java (collate)
Implementation-Version: @IMPLVERSION@
Implementation-Vendor: IBM Corporation
Implementation-Vendor-Id: com.ibm
-Copyright-Info: @COPYRIGHT@
\ No newline at end of file
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4J collate
+Bundle-Description: International Components for Unicode for Java (collate)
+Bundle-SymbolicName: com.ibm.icu.collate
+Bundle-Version: @IMPLVERSION@
+Bundle-Vendor: IBM Corporation
+Bundle-Copyright: @COPYRIGHT@
+Bundle-RequiredExecutionEnvironment: @EXECENV@
diff --git a/icu4j/main/classes/core/manifest.stub b/icu4j/main/classes/core/manifest.stub
index 7507ea2192..d60cc7672d 100644
--- a/icu4j/main/classes/core/manifest.stub
+++ b/icu4j/main/classes/core/manifest.stub
@@ -1,12 +1,17 @@
Manifest-Version: 1.0
-Main-Class: com.ibm.icu.util.VersionInfo
-
-Name: com/ibm/icu/
-Specification-Title: ICU for Java
+Specification-Title: International Components for Unicode for Java (core)
Specification-Version: @SPECVERSION@
-Specification-Vendor: ICU
-Implementation-Title: ICU for Java
+Specification-Vendor: icu-project.org
+Implementation-Title: International Components for Unicode for Java (core)
Implementation-Version: @IMPLVERSION@
Implementation-Vendor: IBM Corporation
Implementation-Vendor-Id: com.ibm
-Copyright-Info: @COPYRIGHT@
\ No newline at end of file
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4J core
+Bundle-Description: International Components for Unicode for Java (core)
+Bundle-SymbolicName: com.ibm.icu.core
+Bundle-Version: @IMPLVERSION@
+Bundle-Vendor: IBM Corporation
+Bundle-Copyright: @COPYRIGHT@
+Bundle-RequiredExecutionEnvironment: @EXECENV@
+Main-Class: com.ibm.icu.util.VersionInfo
diff --git a/icu4j/main/classes/currdata/manifest.stub b/icu4j/main/classes/currdata/manifest.stub
index 57d1a63605..b1edea5116 100644
--- a/icu4j/main/classes/currdata/manifest.stub
+++ b/icu4j/main/classes/currdata/manifest.stub
@@ -1,11 +1,16 @@
Manifest-Version: 1.0
-
-Name: com/ibm/icu/impl
-Specification-Title: ICU for Java Currency Name Data
+Specification-Title: International Components for Unicode for Java (currency data)
Specification-Version: @SPECVERSION@
-Specification-Vendor: ICU
-Implementation-Title: ICU for Java Currency Name Data
+Specification-Vendor: icu-project.org
+Implementation-Title: International Components for Unicode for Java (currency data)
Implementation-Version: @IMPLVERSION@
Implementation-Vendor: IBM Corporation
Implementation-Vendor-Id: com.ibm
-Copyright-Info: @COPYRIGHT@
\ No newline at end of file
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4J currency data
+Bundle-Description: International Components for Unicode for Java (currency data)
+Bundle-SymbolicName: com.ibm.icu.currdata
+Bundle-Version: @IMPLVERSION@
+Bundle-Vendor: IBM Corporation
+Bundle-Copyright: @COPYRIGHT@
+Bundle-RequiredExecutionEnvironment: @EXECENV@
diff --git a/icu4j/main/classes/langdata/manifest.stub b/icu4j/main/classes/langdata/manifest.stub
index 919cdf7c37..b64d6d10e7 100644
--- a/icu4j/main/classes/langdata/manifest.stub
+++ b/icu4j/main/classes/langdata/manifest.stub
@@ -1,11 +1,16 @@
Manifest-Version: 1.0
-
-Name: com/ibm/icu/impl
-Specification-Title: ICU for Java Language Data
+Specification-Title: International Components for Unicode for Java (language data)
Specification-Version: @SPECVERSION@
-Specification-Vendor: ICU
-Implementation-Title: ICU for Java Language Data
+Specification-Vendor: icu-project.org
+Implementation-Title: International Components for Unicode for Java (language data)
Implementation-Version: @IMPLVERSION@
Implementation-Vendor: IBM Corporation
Implementation-Vendor-Id: com.ibm
-Copyright-Info: @COPYRIGHT@
\ No newline at end of file
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4J language data
+Bundle-Description: International Components for Unicode for Java (language data)
+Bundle-SymbolicName: com.ibm.icu.langdata
+Bundle-Version: @IMPLVERSION@
+Bundle-Vendor: IBM Corporation
+Bundle-Copyright: @COPYRIGHT@
+Bundle-RequiredExecutionEnvironment: @EXECENV@
diff --git a/icu4j/main/classes/localespi/manifest.stub b/icu4j/main/classes/localespi/manifest.stub
index e3bb541df4..3a0f3f0f4f 100644
--- a/icu4j/main/classes/localespi/manifest.stub
+++ b/icu4j/main/classes/localespi/manifest.stub
@@ -1,11 +1,16 @@
Manifest-Version: 1.0
-
-Name: com/ibm/icu/impl
-Specification-Title: ICU for Java Locale Service Provider
+Specification-Title: International Components for Unicode for Java (JDK locale service provider)
Specification-Version: @SPECVERSION@
-Specification-Vendor: ICU
-Implementation-Title: ICU for Java Locale Service Provider
+Specification-Vendor: icu-project.org
+Implementation-Title: International Components for Unicode for Java (JDK locale service provider)
Implementation-Version: @IMPLVERSION@
Implementation-Vendor: IBM Corporation
Implementation-Vendor-Id: com.ibm
-Copyright-Info: @COPYRIGHT@
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4J JDK locale service provider
+Bundle-Description: International Components for Unicode for Java (JDK locale service provider)
+Bundle-SymbolicName: com.ibm.icu.localespi
+Bundle-Version: @IMPLVERSION@
+Bundle-Vendor: IBM Corporation
+Bundle-Copyright: @COPYRIGHT@
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/icu4j/main/classes/regiondata/manifest.stub b/icu4j/main/classes/regiondata/manifest.stub
index a285e2fc30..85fc0fde39 100644
--- a/icu4j/main/classes/regiondata/manifest.stub
+++ b/icu4j/main/classes/regiondata/manifest.stub
@@ -1,11 +1,16 @@
Manifest-Version: 1.0
-
-Name: com/ibm/icu/impl
-Specification-Title: ICU for Java Region Data
+Specification-Title: International Components for Unicode for Java (region data)
Specification-Version: @SPECVERSION@
-Specification-Vendor: ICU
-Implementation-Title: ICU for Java Region Data
+Specification-Vendor: icu-project.org
+Implementation-Title: International Components for Unicode for Java (region data)
Implementation-Version: @IMPLVERSION@
Implementation-Vendor: IBM Corporation
Implementation-Vendor-Id: com.ibm
-Copyright-Info: @COPYRIGHT@
\ No newline at end of file
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4J region data
+Bundle-Description: International Components for Unicode for Java (region data)
+Bundle-SymbolicName: com.ibm.icu.regiondata
+Bundle-Version: @IMPLVERSION@
+Bundle-Vendor: IBM Corporation
+Bundle-Copyright: @COPYRIGHT@
+Bundle-RequiredExecutionEnvironment: @EXECENV@
diff --git a/icu4j/main/classes/translit/manifest.stub b/icu4j/main/classes/translit/manifest.stub
index d2149b5ead..2c2a32293c 100644
--- a/icu4j/main/classes/translit/manifest.stub
+++ b/icu4j/main/classes/translit/manifest.stub
@@ -1,11 +1,16 @@
Manifest-Version: 1.0
-
-Name: com/ibm/icu/text
-Specification-Title: ICU for Java Transliteration
+Specification-Title: International Components for Unicode for Java (transliteration)
Specification-Version: @SPECVERSION@
-Specification-Vendor: ICU
-Implementation-Title: ICU for Java Transliteration
+Specification-Vendor: icu-project.org
+Implementation-Title: International Components for Unicode for Java (transliteration)
Implementation-Version: @IMPLVERSION@
Implementation-Vendor: IBM Corporation
Implementation-Vendor-Id: com.ibm
-Copyright-Info: @COPYRIGHT@
\ No newline at end of file
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4J transliteration
+Bundle-Description: International Components for Unicode for Java (transliteration)
+Bundle-SymbolicName: com.ibm.icu.translit
+Bundle-Version: @IMPLVERSION@
+Bundle-Vendor: IBM Corporation
+Bundle-Copyright: @COPYRIGHT@
+Bundle-RequiredExecutionEnvironment: @EXECENV@
diff --git a/icu4j/main/shared/build/common-targets.xml b/icu4j/main/shared/build/common-targets.xml
index 8623516bf6..1c77410259 100644
--- a/icu4j/main/shared/build/common-targets.xml
+++ b/icu4j/main/shared/build/common-targets.xml
@@ -58,6 +58,7 @@
+
@@ -72,16 +73,7 @@
-
-
-
-
-
-
-
-
-
-
+
diff --git a/icu4j/main/shared/build/common.properties b/icu4j/main/shared/build/common.properties
index 448245d984..8bbd4d63f5 100644
--- a/icu4j/main/shared/build/common.properties
+++ b/icu4j/main/shared/build/common.properties
@@ -7,6 +7,7 @@
icu4j.spec.version = 4.5
icu4j.impl.version = 4.5.2
current.year = 2010
+default.exec.env = J2SE-1.5
corp = IBM Corporation
copyright = Copyright 2000-${current.year}, International Business Machines Corporation and others. All Rights Reserved.
@@ -28,6 +29,7 @@ javac.compilerarg = -Xlint:none
jar.spec.version = ${icu4j.spec.version}
jar.impl.version = ${icu4j.impl.version}
jar.copyright.info = ${copyright}
+jar.exec.env = ${default.exec.env}
# Jar locations
icu4j.data.jar = ${shared.dir}/data/icudata.jar
diff --git a/icu4j/manifest.stub b/icu4j/manifest.stub
new file mode 100644
index 0000000000..e1dae267a6
--- /dev/null
+++ b/icu4j/manifest.stub
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Specification-Title: International Components for Unicode for Java
+Specification-Version: @SPECVERSION@
+Specification-Vendor: icu-project.org
+Implementation-Title: International Components for Unicode for Java
+Implementation-Version: @IMPLVERSION@
+Implementation-Vendor: IBM Corporation
+Implementation-Vendor-Id: com.ibm
+Bundle-ManifestVersion: 2
+Bundle-Name: ICU4J
+Bundle-Description: International Components for Unicode for Java
+Bundle-SymbolicName: com.ibm.icu
+Bundle-Version: @IMPLVERSION@
+Bundle-Vendor: IBM Corporation
+Bundle-Copyright: @COPYRIGHT@
+Bundle-RequiredExecutionEnvironment: @EXECENV@
+Main-Class: com.ibm.icu.util.VersionInfo
+Export-Package: com.ibm.icu.lang,com.ibm.icu.math,com.ibm.icu.text,com.ibm.icu.util
\ No newline at end of file