diff --git a/.gitignore b/.gitignore
index 3bfa8e3..adf22ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /ecjsrc-*.jar
 /java10api.jar
 /java14api.jar
+/javax15api.jar
diff --git a/MANIFEST.MF b/MANIFEST.MF
index 27a7202..dcbe379 100644
--- a/MANIFEST.MF
+++ b/MANIFEST.MF
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.jdt.core,org.eclipse.jdt.core.compiler,org
  -internal:=true,org.eclipse.jdt.internal.compiler.tool;x-internal:=tr
  ue
 Bundle-Name: Eclipse Compiler for Java(TM)
-Bundle-Version: 3.23.0.v20200828-0941
+Bundle-Version: 3.24.0.v20201123-0742
 Bundle-ClassPath: .
 Bundle-ManifestVersion: 2
 Bundle-Vendor: Eclipse.org
diff --git a/ecj.spec b/ecj.spec
index d449dcb..af38de0 100644
--- a/ecj.spec
+++ b/ecj.spec
@@ -1,20 +1,21 @@
 Epoch: 1
 
-%global qualifier R-4.17-202009021800
+%global qualifier R-4.18-202012021800
 
 Summary: Eclipse Compiler for Java
 Name: ecj
-Version: 4.17
+Version: 4.18
 Release: 1%{?dist}
 URL: https://www.eclipse.org
 License: EPL-2.0
 
 Source0: https://download.eclipse.org/eclipse/downloads/drops4/%{qualifier}/ecjsrc-%{version}.jar
-Source1: https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.23.0/ecj-3.23.0.pom
+Source1: https://repo1.maven.org/maven2/org/eclipse/jdt/ecj/3.24.0/ecj-3.24.0.pom
 # Extracted from https://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops4/%%{qualifier}/ecj-%%{version}.jar
 Source4: MANIFEST.MF
 # Java API stubs for newer JDKs to allow us to build on the system default JDK
-Source5: java14api.jar
+# Fetched from https://github.com/eclipse/eclipse.jdt.core/blob/R4_18/org.eclipse.jdt.compiler.tool/lib/javax15api.jar
+Source5: https://github.com/eclipse/eclipse.jdt.core/blob/R4_18/org.eclipse.jdt.compiler.tool/lib/javax15api.jar
 
 # Always generate debug info when building RPMs (Andrew Haley)
 Patch0: %{name}-rpmdebuginfo.patch
@@ -28,7 +29,7 @@ BuildRequires: ant
 BuildRequires: javapackages-local
 
 # Build with Java 11 against bootclasspath of Java 8
-BuildRequires: java-11-openjdk-devel
+BuildRequires: java-15-openjdk-devel
 BuildRequires: java-1.8.0-openjdk-devel
 
 %description
@@ -52,11 +53,11 @@ rm ./META-INF/ECLIPSE_.{SF,RSA}
   org.eclipse.tycho:org.eclipse.jdt.core org.eclipse.tycho:org.eclipse.jdt.compiler.apt
 
 # Make Java API stubs available for other packages
-%mvn_artifact "org.eclipse:java14api:jar:14" %{SOURCE5}
-%mvn_alias "org.eclipse:java14api:jar:14" "org.eclipse:java10api:jar:10" "org.eclipse:java9api:jar:9"
+%mvn_artifact "org.eclipse:javax15api:jar:15" %{SOURCE5}
+%mvn_alias "org.eclipse:javax15api:jar:15" "org.eclipse:java10api:jar:10" "org.eclipse:java9api:jar:9"
 
 %build
-JAVA_HOME=%{_jvmdir}/java-11 ant -Djavaapi=%{SOURCE5}
+JAVA_HOME=%{_jvmdir}/java-15 ant -Djavaapi=%{SOURCE5}
 
 %install
 %mvn_artifact pom.xml ecj.jar
@@ -75,6 +76,9 @@ install -m 644 -p ecj.1 $RPM_BUILD_ROOT%{_mandir}/man1/ecj.1
 %{_mandir}/man1/ecj*
 
 %changelog
+* Tue Jan 12 2021 Alexander Kurtakov <akurtako@redhat.com> 1:4.18-1
+- Update to latest upstream release.
+
 * Thu Oct 29 2020 Mat Booth <mat.booth@redhat.com> - 1:4.17-1
 - Update to latest upstream release
 
diff --git a/sources b/sources
index fa5ca8f..50d4b02 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (ecjsrc-4.17.jar) = 34de4a10d0459f105eb006f52532ad0021d01a0648b17d749cfdbc54a6eb364f3cfaaf75fde72e7d291723064e7e8a518180ed71e3715c32c672f4d068b208dd
-SHA512 (ecj-3.23.0.pom) = a23d49acb760269a7acc40f07f1bc256b297a939d3fd30238e8f73560d80c7ebd233ceb5c1281fd18e6b4a370401b09d173c2c54e4091b8778d3b4cbeaac2805
-SHA512 (java14api.jar) = 0026513d7783924261b45d575831b562c2b17ba704f38864b385a636a2c348d8746936234a88dc6e04d5560659ca621333909248be92f59ab7d787b7ce4982aa
+SHA512 (ecj-3.24.0.pom) = 8ed2e8b16b917a4274a9e06c411f4a03d12c229b93038d400156ff5507a7983c1b8eaea7152a03416392adc4ce845567bc1200063ec3912384fd6c32261ff601
+SHA512 (ecjsrc-4.18.jar) = d68134a517b4dfb24023c0b4871cf25513454049b631729c9b57767c7045a10299eba2bda2188d18492899165a7a723e94595cbc47a849ee12eaa66596df4f4b
+SHA512 (javax15api.jar) = b7a85eae8eeb44564eddeab88b7873b5e5701622c888e316fb95a988d7138db66ed8438605a30df2ac4c442873b4a99325b85d9102f6fc47686a361f25fd66e6