diff --git a/packages/moxxmpp/CHANGELOG.md b/packages/moxxmpp/CHANGELOG.md
index ee3c3d7..98ee0c3 100644
--- a/packages/moxxmpp/CHANGELOG.md
+++ b/packages/moxxmpp/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 0.4.1
+- Moved FAST from staging to xep_0484.dart
+
 ## 0.4.0
 
 - **BREAKING**: Remove `lastResource` from `XmppConnection`'s `connect` method. Instead, set the `StreamManagementNegotiator`'s `resource` attribute instead. Since the resource can only really be restored by stream management, this is no issue.
diff --git a/packages/moxxmpp/lib/moxxmpp.dart b/packages/moxxmpp/lib/moxxmpp.dart
index 6560fe4..63a3c6c 100644
--- a/packages/moxxmpp/lib/moxxmpp.dart
+++ b/packages/moxxmpp/lib/moxxmpp.dart
@@ -39,7 +39,6 @@ export 'package:moxxmpp/src/socket.dart';
 export 'package:moxxmpp/src/stanza.dart';
 export 'package:moxxmpp/src/stringxml.dart';
 export 'package:moxxmpp/src/util/typed_map.dart';
-export 'package:moxxmpp/src/xeps/staging/fast.dart';
 export 'package:moxxmpp/src/xeps/staging/file_upload_notification.dart';
 export 'package:moxxmpp/src/xeps/xep_0004.dart';
 export 'package:moxxmpp/src/xeps/xep_0030/errors.dart';
@@ -96,3 +95,4 @@ export 'package:moxxmpp/src/xeps/xep_0447.dart';
 export 'package:moxxmpp/src/xeps/xep_0448.dart';
 export 'package:moxxmpp/src/xeps/xep_0449.dart';
 export 'package:moxxmpp/src/xeps/xep_0461.dart';
+export 'package:moxxmpp/src/xeps/xep_0484.dart';
diff --git a/packages/moxxmpp/lib/src/xeps/staging/fast.dart b/packages/moxxmpp/lib/src/xeps/xep_0484.dart
similarity index 100%
rename from packages/moxxmpp/lib/src/xeps/staging/fast.dart
rename to packages/moxxmpp/lib/src/xeps/xep_0484.dart
diff --git a/packages/moxxmpp/moxxmpp.doap b/packages/moxxmpp/moxxmpp.doap
index d04ae9f..1bfcf5f 100644
--- a/packages/moxxmpp/moxxmpp.doap
+++ b/packages/moxxmpp/moxxmpp.doap
@@ -274,16 +274,16 @@
         <xmpp:version>0.2.0</xmpp:version>
       </xmpp:SupportedXep>
     </implements>
-
-    <!-- Non-Standard (Proto) XEPs -->
     <implements>
       <xmpp:SupportedXep>
- 	      <xmpp:xep rdf:resource="https://xmpp.org/extensions/inbox/xep-fast.html" />
+ 	      <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0484.html" />
 	      <xmpp:status>partial</xmpp:status>
-	      <xmpp:version>0.0.1</xmpp:version>
+	      <xmpp:version>0.1.1</xmpp:version>
 	      <xmpp:note xml:lang="en">Invalidation is never requested</xmpp:note>
-      </xmpp:SupportedXep> 
+      </xmpp:SupportedXep>
     </implements>
+
+    <!-- Non-Standard (Proto) XEPs -->
     <implements>
       <xmpp:SupportedXep>
         <xmpp:xep rdf:resource="https://codeberg.org/moxxy/custom-xeps/src/branch/master/xep-xxxx-file-upload-notification.md"/>