diff --git a/.gitignore b/.gitignore
index 524c85ec4632bc06f9e632dd0134e0ddd2bd1f88..00ad5a39deb9ad27d4014b7e18b9d6e71f0511c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,6 +30,8 @@ autom4te.cache
 intltool-*
 /org.gnome.nm-applet.gschema.xml
 /org.gnome.nm-applet.gschema.valid
+/org.gnome.nm-applet.eap.gschema.xml
+/org.gnome.nm-applet.eap.gschema.valid
 
 po/boldquot.sed
 po/en@boldquot.header
diff --git a/Makefile.am b/Makefile.am
index ceb422304ca8a6ecdaa1962fa7f82a0875ebc598..bc3df6ae887e70e994cf896bf6c652790514bf9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -797,7 +797,11 @@ MKDB_OPTIONS = --ignore-files "$(IGNORE_HFILES) $(mkdb_ignore_c_files)"
 
 ###############################################################################
 
-gsettings_SCHEMAS = org.gnome.nm-applet.gschema.xml
+# org.gnome.nm-applet.gschema.xml belongs to nm-applet.
+# Kept here for now to avoid breaking on upgrades.
+gsettings_SCHEMAS = \
+	org.gnome.nm-applet.gschema.xml \
+	org.gnome.nm-applet.eap.gschema.xml
 @GSETTINGS_RULES@
 
 check_PROGRAMS += $(check_programs)
diff --git a/configure.ac b/configure.ac
index 9089147778818ba4a9bec4c89a86bd21e9cd69bf..74fcba515cf552fec99e757b8986dedf2c1f3f5e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -291,6 +291,7 @@ AC_DEFINE_UNQUOTED(NM_MORE_ASSERTS, $more_asserts, [Define if more asserts are e
 AC_CONFIG_FILES([
 Makefile
 org.gnome.nm-applet.gschema.xml
+org.gnome.nm-applet.eap.gschema.xml
 po/Makefile.in
 src/libnma-gtk4.pc
 src/libnma.pc
diff --git a/meson.build b/meson.build
index 8114f4e70f1e72fd8c26f50148a37c0278239626..595692cf81c0003ef1663236ffe00652e2e50c1d 100644
--- a/meson.build
+++ b/meson.build
@@ -389,14 +389,20 @@ endif
 schema_conf = configuration_data()
 schema_conf.set('GETTEXT_PACKAGE', 'libnma')
 
-schema = 'org.gnome.nm-applet.gschema.xml'
+foreach schema : [
+  'org.gnome.nm-applet.eap.gschema.xml',
 
-configure_file(
-  input: schema + '.in',
-  output: schema,
-  install_dir: join_paths(nma_datadir, 'glib-2.0', 'schemas'),
-  configuration: schema_conf,
-)
+  # This one belongs to nm-applet.
+  # Kept here for now to avoid breaking on upgrades.
+  'org.gnome.nm-applet.gschema.xml'
+]
+  configure_file(
+    input: schema + '.in',
+    output: schema,
+    install_dir: join_paths(nma_datadir, 'glib-2.0', 'schemas'),
+    configuration: schema_conf,
+  )
+endforeach
 
 config = 'config.h'
 
diff --git a/org.gnome.nm-applet.eap.gschema.xml.in b/org.gnome.nm-applet.eap.gschema.xml.in
new file mode 100644
index 0000000000000000000000000000000000000000..0fc3ca9f1f613e2672b6379fba543bf26d83e8d9
--- /dev/null
+++ b/org.gnome.nm-applet.eap.gschema.xml.in
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <schema id="org.gnome.nm-applet.eap" path="/org/gnome/nm-applet/eap/" gettext-domain="nm-applet">
+    <key name="ignore-ca-cert" type="b">
+      <default>false</default>
+      <summary>Ignore CA certificate</summary>
+      <description>Set this to true to disable warnings about CA certificates in EAP authentication.</description>
+    </key>
+    <key name="ignore-phase2-ca-cert" type="b">
+      <default>false</default>
+      <summary>Ignore CA certificate</summary>
+      <description>Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/org.gnome.nm-applet.gschema.xml.in b/org.gnome.nm-applet.gschema.xml.in
index 9e2887ea3c1c76a0c8a481c8cffc9225df4ef3be..09631a7031c1c5e4694eba54fdc77ebf27b14223 100644
--- a/org.gnome.nm-applet.gschema.xml.in
+++ b/org.gnome.nm-applet.gschema.xml.in
@@ -37,16 +37,4 @@
       <description>Set to FALSE to disable displaying the applet in the notification area.</description>
     </key>
   </schema>
-  <schema id="org.gnome.nm-applet.eap">
-    <key name="ignore-ca-cert" type="b">
-      <default>false</default>
-      <summary>Ignore CA certificate</summary>
-      <description>Set this to true to disable warnings about CA certificates in EAP authentication.</description>
-    </key>
-    <key name="ignore-phase2-ca-cert" type="b">
-      <default>false</default>
-      <summary>Ignore CA certificate</summary>
-      <description>Set this to true to disable warnings about CA certificates in phase 2 of EAP authentication.</description>
-    </key>
-  </schema>
 </schemalist>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 08e4f1f2f58378767c4bb439ecf1d8b1f4090461..f76f55689627d19d11a3471262dc15b821527215 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-org.gnome.nm-applet.gschema.xml.in
+org.gnome.nm-applet.eap.gschema.xml.in
 shared/nm-utils/nm-shared-utils.c
 src/nma-bar-code-widget.c
 src/nma-bar-code-widget.ui