diff --git a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/org.eclipse.jdt.ui.prefs b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/org.eclipse.jdt.ui.prefs
index af9117f9..12065c54 100644
--- a/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/org.eclipse.jdt.ui.prefs
+++ b/spring-javaformat-eclipse/io.spring.javaformat.eclipse/src/io/spring/javaformat/eclipse/projectsettings/org.eclipse.jdt.ui.prefs
@@ -64,7 +64,7 @@ formatter_settings_version=13
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;;org.springframework;\#;
+org.eclipse.jdt.ui.importorder=java;javax;jakarta;;org.springframework;\#;
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=9999
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/SpringImportOrderCheck.java b/spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/SpringImportOrderCheck.java
index 5c80479d..d8ccae3b 100644
--- a/spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/SpringImportOrderCheck.java
+++ b/spring-javaformat/spring-javaformat-checkstyle/src/main/java/io/spring/javaformat/checkstyle/check/SpringImportOrderCheck.java
@@ -39,7 +39,7 @@ public SpringImportOrderCheck() {
 	}
 
 	public void setProjectRootPackage(String projectRootPackage) {
-		setGroups("java", "/^javax?\\./", "*", projectRootPackage);
+		setGroups("java", "/^javax?\\./", "/^jakarta?\\./", "*", projectRootPackage);
 	}
 
 }
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/ImportOrderValid.txt b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/ImportOrderValid.txt
new file mode 100644
index 00000000..69174e4c
--- /dev/null
+++ b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/check/ImportOrderValid.txt
@@ -0,0 +1 @@
++0 errors
\ No newline at end of file
diff --git a/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/ImportOrderValid.java b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/ImportOrderValid.java
new file mode 100644
index 00000000..14711cd6
--- /dev/null
+++ b/spring-javaformat/spring-javaformat-checkstyle/src/test/resources/source/ImportOrderValid.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2017-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example;
+
+import java.util.Objects;
+
+import javax.annotation.Nonnull;
+
+import jakarta.servlet.Servlet;
+
+/**
+ * Custom pacakge with valid imports.
+ *
+ * @author Phillip Webb
+ */
+public final class ImportOrderValid {
+
+	private ImportOrderValid() {
+	}
+
+	@Nonnull
+	public static void main(String[] args) {
+		Objects.nonNull(null);
+		Servlet s = null;
+	}
+
+}