diff --git a/README.md b/README.md
index bd22a29..227fa5e 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 ## Bootstrapping OpenJDK 8
 
 ```sh
+sudo emerge -a1 =dev-java/openjdk-8.272_p10
 sudo emerge -av dev-java/openjdk:8
 sudo emerge -a1v =dev-java/icedtea-3.21.0
 sudo emerge -a --depclean # Remove old software that was used for bootstrapping
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index ac71b15..1cd3efb 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,6 +1,6 @@
 AUX compiler-settings-3.2 258 BLAKE2B 11b1f283a93a8ff9ce57dc51aebfaafe4130eb66180474c5ce795c0b2b7a906c6c1c36b649fd525ad6dca12f2d29c24dd2c05d81fec783b114bd5943b52fdd86 SHA512 51c692c00788237c2bd4c51d5dda1bc06630490b0eb4f2e6b15355b37341932f6544d4a94d0f92f9c45c9a6546972895660b07e6cd71b241d453936333b9ee32
-AUX eclipse-ecj-3.2-build-gentoo.patch 1874 BLAKE2B dee1fd186a776a049ecdaf05472dafb703b377fdf58cfe8efa62fc8ee26e3465b04a3caf76292597df67a8fd056e99def64cbe7bc10a77ef19e969cf932d1993 SHA512 69c01c184c0b0aae461d51381f16eace5c2ed6775eb71a1abdab04af3957324501535b043134824408f02761b6c0fe3fb2db9cc477974cd7e8f6ad77b344f6b4
+AUX eclipse-ecj-3.2.2-build-gentoo.patch 1878 BLAKE2B 21cd335b11bf5dbdc4b2ce9902b17f9d8d1c61187836adb1f8075852fe6074b23b2ca1cd7c4c000f447cff336098cf43d03445e8320372e5df0a0e438d061993 SHA512 cc393c37b693b36a7715e2e3f2fa8e87fe9697e9846da60c4c950bc5be8202e12566aec87b458f706f1bbdd6ea5dfe7f7e92c66fb87ec54f74ea004d12ac4221
 DIST ecjsrc-4.2.1.jar 1417043 BLAKE2B dc6915ec85d96a6ecdafb04485549feeb6ef8329811e294647e9e179ff3b1ec3cea55c29ad23b306ff3489dbfe6f574dc691ee31080a592d71607d3a996e9bb4 SHA512 967b47a722893ea1f9eb17e69d386881dc87516e93c1d7a2a119d6fb2e053faa0d9d6455b6e4b89c3f23a3ec7ae33686f4acc305d7c6e51929ce7837c9c93eaf
-DIST eclipse-ecj-3.2.tar.bz2 612611 BLAKE2B dc2cadb2f7be85f6583020079f2e02a66d6432b35f595c44cc38731504c8dcd43cd3e407b80c93e5dc828e10eb37d78a74a4674e2c7c5eac7329f179947b8683 SHA512 037564cacb154e6dc81718cbb1a4f1547663c151681e3725d7728db782611ed22905d5395d24214336cfaefeeb4e2ea87fab69f5012f163164a7aaf87f203ba2
-EBUILD eclipse-ecj-3.2.ebuild 1515 BLAKE2B a1677e28c08abb8b0fb2684c83ca01a3c4af640e151a058a0857cf3b9dccb55b889e439cc29ef618937587a908877d0b25ae1e80a50839c115bb92ea74d081a1 SHA512 f90d4a4e24695eb2dc49a1f9bdd582c81d5c3d4d2fd91a2e9996e90b4bd3b05ff76f8a4f1b907df2a788c023a4e0f1a65b8cf82f0e3a656bb48833c4dccd1b04
+DIST eclipse-sourceBuild-srcIncluded-3.2.2.zip 82487328 BLAKE2B 3ab955a7034f98006c2e9e532affc2dc69ac4325e394bbd18fce71dea2b78c1b74444fe26ec2cadd35701ee8a18799cbcc80a729f6dd801df35f3bdb274bc8c7 SHA512 74a7e66f4411e1856d35c396ffb12124ac5ad622e5cb401558b24aa675d158efbc1522534e962786adf6ae8ff328d394f25f8f28d6b6a9e5531bc4abf241c8f3
+EBUILD eclipse-ecj-3.2.2.ebuild 1773 BLAKE2B 8882f799966544284aa83eb73cbab70ff49f8a0b211ce79261edd91e7bce3a00cf3448e21b7b91d7c7f04a91f966288702f4cf942d750857b7a0a93200a49281 SHA512 487512b8b213e9e45f4484626fbcae18d0cbcab07ebc771bb28cfaa8ee18c85532f103cec8b26e814072235dd74f777052ce47204deef30cc0a8ff16fad59c2f
 EBUILD eclipse-ecj-4.2.1.ebuild 2912 BLAKE2B 396f82c242933b4c0332a532abe5487ef9e805072291dff63f2b1b580ecd5460eab11cd5fde5bc75da65fe6434a044565c71cbf2aef1102fbe8b99cf0b372d38 SHA512 8ac6288fd173e4efaae2e7aa0103370de23352fd5d1cea8fccf5b87af0570533e1b8416d8a65dc18fcf05d109dd522f09c7ba5f42bc3ce8f9a3fd8ac5fab5c91
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.2.2.ebuild
similarity index 83%
rename from dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
rename to dev-java/eclipse-ecj/eclipse-ecj-3.2.2.ebuild
index fa423d5..58a4d90 100644
--- a/dev-java/eclipse-ecj/eclipse-ecj-3.2.ebuild
+++ b/dev-java/eclipse-ecj/eclipse-ecj-3.2.2.ebuild
@@ -8,9 +8,13 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP=true
 
 inherit java-pkg-2 java-vm-2 java-ant-2
 
+DMF="R-${PV}-200702121330"
+
 DESCRIPTION="Eclipse Compiler for Java"
 HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="${P}.tar.bz2"
+#SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops/${DMF}/ecjsrc.zip"
+SRC_URI="https://archive.eclipse.org/eclipse/downloads/drops/${DMF}/eclipse-sourceBuild-srcIncluded-${PV}.zip"
+
 LICENSE="EPL-1.0"
 KEYWORDS="amd64 arm64"
 SLOT="3.2"
@@ -23,7 +27,9 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	mv jdtcoresrc eclipse-ecj-3.2.2
+	cd ${S}
+	unzip -d src -q src/ecj.zip
     
 	# remove unzip, add javadoc target, put final ecj.jar and javadocs in dist/ and not ../
 	eapply "${FILESDIR}/${P}-build-gentoo.patch"
diff --git a/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch b/dev-java/eclipse-ecj/files/eclipse-ecj-3.2.2-build-gentoo.patch
similarity index 72%
rename from dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
rename to dev-java/eclipse-ecj/files/eclipse-ecj-3.2.2-build-gentoo.patch
index c60a659..7f146f4 100644
--- a/dev-java/eclipse-ecj/files/eclipse-ecj-3.2-build-gentoo.patch
+++ b/dev-java/eclipse-ecj/files/eclipse-ecj-3.2.2-build-gentoo.patch
@@ -1,6 +1,6 @@
-diff -Naur eclipse-ecj-3.2/compilejdtcorewithjavac.xml eclipse-ecj-3.2-mod/compilejdtcorewithjavac.xml
---- eclipse-ecj-3.2/compilejdtcorewithjavac.xml	2006-06-30 01:20:00.000000000 +0200
-+++ eclipse-ecj-3.2-mod/compilejdtcorewithjavac.xml	2006-07-28 01:35:06.000000000 +0200
+diff -Naur eclipse-ecj-3.2.2/compilejdtcorewithjavac.xml eclipse-ecj-3.2.2/compilejdtcorewithjavac.xml
+--- eclipse-ecj-3.2.2/compilejdtcorewithjavac.xml	2006-06-30 01:20:00.000000000 +0200
++++ eclipse-ecj-3.2.2-mod/compilejdtcorewithjavac.xml	2006-07-28 01:35:06.000000000 +0200
 @@ -6,7 +6,6 @@
  		<tstamp/>
  		<property name="srcdir" value="src" />
@@ -9,9 +9,9 @@ diff -Naur eclipse-ecj-3.2/compilejdtcorewithjavac.xml eclipse-ecj-3.2-mod/compi
  	</target>
  
  	<target name="compile" depends="init">
-diff -Naur eclipse-ecj-3.2/compilejdtcore.xml eclipse-ecj-3.2-mod/compilejdtcore.xml
---- eclipse-ecj-3.2/compilejdtcore.xml	2006-06-30 01:20:00.000000000 +0200
-+++ eclipse-ecj-3.2-mod/compilejdtcore.xml	2006-07-29 03:22:07.000000000 +0200
+diff -Naur eclipse-ecj-3.2.2/compilejdtcore.xml eclipse-ecj-3.2.2/compilejdtcore.xml
+--- eclipse-ecj-3.2.2/compilejdtcore.xml	2006-06-30 01:20:00.000000000 +0200
++++ eclipse-ecj-3.2.2/compilejdtcore.xml	2006-07-29 03:22:07.000000000 +0200
 @@ -5,7 +5,9 @@
  	<target name="init">
  		<tstamp/>
diff --git a/profiles/package.unmask b/profiles/package.unmask
new file mode 100644
index 0000000..e58f3cf
--- /dev/null
+++ b/profiles/package.unmask
@@ -0,0 +1 @@
+dev-java/icedtea