diff --git a/lib/build.gradle b/lib/build.gradle
index 056d00778ee..4a8675857ed 100644
--- a/lib/build.gradle
+++ b/lib/build.gradle
@@ -68,6 +68,7 @@ def srcDirs = [
   'com/google/android/material/textview',
   'com/google/android/material/theme',
   'com/google/android/material/theme/overlay',
+  'com/google/android/material/tooltip',
   'com/google/android/material/transformation',
   'com/google/android/material/typography',
 ]
diff --git a/lib/java/com/google/android/material/tooltip/build.gradle b/lib/java/com/google/android/material/tooltip/build.gradle
new file mode 100644
index 00000000000..3524c6f11a6
--- /dev/null
+++ b/lib/java/com/google/android/material/tooltip/build.gradle
@@ -0,0 +1,32 @@
+apply plugin: 'com.android.library'
+apply plugin: 'com.github.dcendents.android-maven'
+
+dependencies {
+  implementation compatibility("appcompat")
+
+  implementation project(fromPath("lib/java/com/google/android/material/color"))
+  implementation project(fromPath("lib/java/com/google/android/material/shape"))
+}
+
+android {
+  sourceSets {
+    main.manifest.srcFile 'AndroidManifest.xml'
+    main.java.srcDir '.'
+    main.java.excludes = [
+      '**/build/**',
+    ]
+    main.res.srcDirs = [
+      'res',
+      'res-public'
+    ]
+    main.assets.srcDir 'assets'
+  }
+}
+
+uploadArchives {
+  repositories {
+    mavenDeployer {
+      repository(url: rootProject.ext.mavenRepoUrl)
+    }
+  }
+}
diff --git a/lib/java/com/google/android/material/tooltip/res-public/values/public.xml b/lib/java/com/google/android/material/tooltip/res-public/values/public.xml
index 86e8ce6f45e..8285f7a1bdb 100644
--- a/lib/java/com/google/android/material/tooltip/res-public/values/public.xml
+++ b/lib/java/com/google/android/material/tooltip/res-public/values/public.xml
@@ -17,5 +17,7 @@
 <resources>
   <public name="tooltipStyle" type="attr"/>
   <public name="backgroundTint" type="color" />
+  <public name="ShapeAppearance.MaterialComponents.Tooltip" type="style"/>
   <public name="TextAppearance.MaterialComponents.Tooltip" type="style"/>
+  <public name="Widget.MaterialComponents.Tooltip" type="style"/>
 </resources>