diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 442a1fa5..1b182383 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,10 +13,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Java 11
+    - name: Set up Java 17
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: liberica
     
     - name: Build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 51e0a58c..9f7a6cd4 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,10 +19,10 @@ jobs:
         cat ./CHANGELOG.md | grep "$BUILD_TAG" | sed 's%^\*[[:space:]]*\*\*[0-9.]*\*\*[[:space:]]*%%g' > ${{ github.workspace }}-CHANGELOG.txt
         echo "build_tag=${BUILD_TAG}" >> $GITHUB_OUTPUT
 
-    - name: Set up Java 11
+    - name: Set up Java 17
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: liberica
     
     - name: Build
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7d6ce4b..c9cf1aed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 
-# CheckStyle-IDEA Changelog
-
+# CheckStyle-IDEA Changel
+* **5.87.0** New: Now built against IDEA 2023.1.5 (was 2022.1.4).
 * **5.86.0** New: Added Checkstyle 10.13.0, 10.12.7.
 * **5.85.1** Fixed: EDT access error in commit dialogue (#626).
 * **5.85.0** New: Added Checkstyle 10.12.5.
diff --git a/build.gradle b/build.gradle
index 6d372364..c9e1028f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,10 +16,10 @@ repositories {
 //   Project Metadata
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-version = '5.86.0'
+version = '5.87.0'
 
 intellij {
-    version = 'IC-2022.1.4'
+    version = 'IC-2023.1.5'
     pluginName = 'CheckStyle-IDEA'
     updateSinceUntilBuild = false
     instrumentCode = false
@@ -49,14 +49,16 @@ configurations.all {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(11)
+        languageVersion = JavaLanguageVersion.of(17)
     }
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
     options.compilerArgs << '-Xlint:deprecation'
-    options.release.set(11)
+    options.release.set(17)
 
     if (it.name == 'compileCsaccessJava' || it.name == 'compileCsaccessTestJava') {
         options.compilerArgs << '-Xlint:unchecked'
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index ddd5995e..0c20b3c7 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -21,8 +21,10 @@ dependencies {
 //   Compilation
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-sourceCompatibility = JavaVersion.VERSION_11
-targetCompatibility = JavaVersion.VERSION_11
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
diff --git a/src/main/java/org/infernus/idea/checkstyle/util/ProjectPaths.java b/src/main/java/org/infernus/idea/checkstyle/util/ProjectPaths.java
index b9c38ef2..34cd263c 100644
--- a/src/main/java/org/infernus/idea/checkstyle/util/ProjectPaths.java
+++ b/src/main/java/org/infernus/idea/checkstyle/util/ProjectPaths.java
@@ -5,7 +5,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public class ProjectPaths {
 
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index a8aa8fd9..bea6ef87 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -15,8 +15,8 @@
 </p>
         ]]>
     </description>
-    <version>5.86.0</version>
-    <idea-version since-build="221.6008.13"/>
+    <version>5.87.0</version>
+    <idea-version since-build="231.9392.1"/>
     <vendor url="https://infernus.org/" email="jamie@infernus.org">Jamie Shiell</vendor>
 
     <depends>com.intellij.modules.java</depends>
@@ -24,6 +24,7 @@
     <change-notes>
         <![CDATA[
 <ul>
+    <li>5.87.0: New: Now built against IDEA 2023.1.5 (was 2022.1.4).</li>
     <li>5.86.0: New: Added Checkstyle 10.13.0, 10.12.7.</li>
     <li>5.85.1: Fixed: EDT access error in commit dialogue (#626).</li>
     <li>5.85.0: New: Added Checkstyle 10.12.5.</li>
@@ -38,10 +39,6 @@
     <li>5.78.0: New: Added Checkstyle 10.9.3.</li>
     <li>5.78.0: Fixed: Colour mismatch in new UI (#608).</li>
     <li>5.78.0: Fixed: Improved action update handling to reduce pauses (#601).</li>
-    <li>5.77.0: Fixed: Remove constructor injection from CheckerFactory for 2023.x compatibility (#604).</li>
-    <li>5.77.0: New: Now built against IDEA 2022.1.4 (was 2021.3.3).</li>
-    <li>5.77.0: New: Added Checkstyle 10.8.1.</li>
-    <li>5.76.0: New: Added Checkstyle 10.7.0.</li>
     <li><em>For older changes please see the changelog.</em></li>
 </ul>
         ]]>