diff --git a/auth/build.gradle.kts b/auth/build.gradle.kts
index 4c2fd66e5..331e99c0e 100644
--- a/auth/build.gradle.kts
+++ b/auth/build.gradle.kts
@@ -13,6 +13,7 @@ android {
         minSdk = Config.SdkVersions.min
         targetSdk = Config.SdkVersions.target
 
+        buildConfigField("String", "LIBRARY_NAME", "\"Firebase-UI-Android\"")
         buildConfigField("String", "VERSION_NAME", "\"${Config.version}\"")
 
         resourcePrefix("fui_")
@@ -68,6 +69,7 @@ android {
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 }
 
diff --git a/auth/src/main/AndroidManifest.xml b/auth/src/main/AndroidManifest.xml
index 3446e5dbe..6c2ae51c8 100644
--- a/auth/src/main/AndroidManifest.xml
+++ b/auth/src/main/AndroidManifest.xml
@@ -19,6 +19,12 @@
 
     <application>
 
+        <service android:name="com.google.firebase.components.ComponentDiscoveryService">
+            <meta-data
+                android:name="com.google.firebase.components:com.firebase.ui.auth.compose.FirebaseUIComposeRegistrar"
+                android:value="com.google.firebase.components.ComponentRegistrar" />
+        </service>
+
         <meta-data
             android:name="com.google.android.gms.version"
             android:value="@integer/google_play_services_version" />
diff --git a/auth/src/main/java/com/firebase/ui/auth/compose/FirebaseUIComposeRegistrar.kt b/auth/src/main/java/com/firebase/ui/auth/compose/FirebaseUIComposeRegistrar.kt
new file mode 100644
index 000000000..62da63759
--- /dev/null
+++ b/auth/src/main/java/com/firebase/ui/auth/compose/FirebaseUIComposeRegistrar.kt
@@ -0,0 +1,34 @@
+// Copyright 2025 Google LLC
+//
+// 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
+//
+//      http://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.firebase.ui.auth.compose
+
+import androidx.annotation.Keep
+import com.firebase.ui.auth.BuildConfig
+import com.google.firebase.components.Component
+import com.google.firebase.components.ComponentRegistrar
+import com.google.firebase.platforminfo.LibraryVersionComponent
+
+/**
+ * Registers the FirebaseUI-Android Compose library with Firebase Analytics.
+ * This enables Firebase to track which versions of FirebaseUI are being used.
+ */
+@Keep
+class FirebaseUIComposeRegistrar : ComponentRegistrar {
+    override fun getComponents(): List<Component<*>> {
+        return listOf(
+            LibraryVersionComponent.create(BuildConfig.LIBRARY_NAME, BuildConfig.VERSION_NAME)
+        )
+    }
+}