diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5f25385d1c20060379b7f92ae2bf3ce7fb6f905..83f556676a299e16cede5c704a691d49d2bf0609 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,16 @@
 
 ### Fixed
 
+## [0.3.6]
+
+### Added
+
+- Support for IntelliJ IDEA 2025.1
+
+### Changed
+
+- Update source and target Java version to 21
+
 ## [0.3.5]
 
 ### Added
diff --git a/build.gradle.kts b/build.gradle.kts
index 93cd05e49732fbf968869399f374fc5ca7149e5b..3b3757eea446be97ef1d7d7036f3a6eca704d3c1 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -182,11 +182,11 @@ tasks {
     }
 
     withType<JavaCompile> {
-        sourceCompatibility = "17"
-        targetCompatibility = "17"
+        sourceCompatibility = "21"
+        targetCompatibility = "21"
     }
 
     withType<Detekt> {
-        jvmTarget = "17"
+        jvmTarget = "21"
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 8447f1a69ce222fb71fe21aa72b5c2dc8a8d8de7..a8b0c408eb561faf21d12e1e3e8019728a479de2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,16 +4,16 @@
 pluginGroup = org.jastadd
 pluginId = JastAdd
 pluginName = JastAdd Language Support
-pluginVersion = 0.3.5
+pluginVersion = 0.3.6
 pluginRepositoryUrl = https://git-st.inf.tu-dresden.de/jastadd/jetbrains-plugin/
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild = 223
-pluginUntilBuild = 243.*
+pluginUntilBuild = 251.*
 
 platformType = IC
-platformVersion = 2024.3
+platformVersion = 2025.1
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 # Example: platformPlugins = com.jetbrains.php:203.4449.22, org.intellij.scala:2023.3.27@EAP