diff --git a/.changeset/warm-kings-sleep.md b/.changeset/warm-kings-sleep.md
new file mode 100644
index 000000000..75e52eefa
--- /dev/null
+++ b/.changeset/warm-kings-sleep.md
@@ -0,0 +1,5 @@
+---
+'emotion': patch
+---
+
+Export TS & Flow types for emotion/macro
diff --git a/packages/emotion/macro.d.ts b/packages/emotion/macro.d.ts
new file mode 100644
index 000000000..c7c3ab45c
--- /dev/null
+++ b/packages/emotion/macro.d.ts
@@ -0,0 +1,3 @@
+declare module 'emotion/macro' {
+  export * from 'emotion'
+}
diff --git a/packages/emotion/macro.js.flow b/packages/emotion/macro.js.flow
new file mode 100644
index 000000000..63ae97e66
--- /dev/null
+++ b/packages/emotion/macro.js.flow
@@ -0,0 +1,2 @@
+// @flow
+export * from './src/index.js'
diff --git a/packages/emotion/package.json b/packages/emotion/package.json
index b6fd9a14f..4ac9241ea 100644
--- a/packages/emotion/package.json
+++ b/packages/emotion/package.json
@@ -8,8 +8,10 @@
   "files": [
     "src",
     "dist",
+    "types",
     "macro.js",
-    "types"
+    "macro.d.ts",
+    "macro.js.flow"
   ],
   "scripts": {
     "test:typescript": "dtslint types"
@@ -43,4 +45,4 @@
   "preconstruct": {
     "umdName": "emotion"
   }
-}
\ No newline at end of file
+}