diff --git a/crates/ruma-common/CHANGELOG.md b/crates/ruma-common/CHANGELOG.md
index 0a13ee0c..c261bf4f 100644
--- a/crates/ruma-common/CHANGELOG.md
+++ b/crates/ruma-common/CHANGELOG.md
@@ -1,5 +1,10 @@
 # [unreleased]
 
+Bug fixes:
+
+- Move `.m.rule.roomnotif` push rule before `.m.rule.tombstone` in the server default push rules,
+  according to a spec clarification in Matrix 1.6
+
 Improvements:
 
 * Add `MatrixVersion::V1_6`
diff --git a/crates/ruma-common/src/push/predefined.rs b/crates/ruma-common/src/push/predefined.rs
index f56ed379..e58f1048 100644
--- a/crates/ruma-common/src/push/predefined.rs
+++ b/crates/ruma-common/src/push/predefined.rs
@@ -27,9 +27,9 @@ impl Ruleset {
                 ConditionalPushRule::invite_for_me(user_id),
                 ConditionalPushRule::member_event(),
                 ConditionalPushRule::contains_display_name(),
+                ConditionalPushRule::roomnotif(),
                 ConditionalPushRule::tombstone(),
                 ConditionalPushRule::server_acl(),
-                ConditionalPushRule::roomnotif(),
                 #[cfg(feature = "unstable-msc2677")]
                 ConditionalPushRule::reaction(),
             ]
@@ -390,6 +390,10 @@ pub enum PredefinedOverrideRuleId {
     /// `.m.rule.contains_display_name`
     ContainsDisplayName,
 
+    /// `.m.rule.roomnotif`
+    #[ruma_enum(rename = ".m.rule.roomnotif")]
+    RoomNotif,
+
     /// `.m.rule.tombstone`
     Tombstone,
 
@@ -397,10 +401,6 @@ pub enum PredefinedOverrideRuleId {
     #[ruma_enum(rename = ".m.rule.room.server_acl")]
     RoomServerAcl,
 
-    /// `.m.rule.roomnotif`
-    #[ruma_enum(rename = ".m.rule.roomnotif")]
-    RoomNotif,
-
     /// `.m.rule.reaction`
     #[cfg(feature = "unstable-msc2677")]
     Reaction,