diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4441175..f63785c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improve types for `Listbox` component ([#576](https://github.com/tailwindlabs/headlessui/pull/576))
 - Remove explicit `:class` prop ([#608](https://github.com/tailwindlabs/headlessui/pull/608))
 - Improve tree shaking ([#602](https://github.com/tailwindlabs/headlessui/pull/602))
+- Improve peer dependencies for `react-dom`, and for the future version `18` ([#622](https://github.com/tailwindlabs/headlessui/pull/622))
 
 ## [Unreleased - Vue]
 
diff --git a/packages/@headlessui-react/package.json b/packages/@headlessui-react/package.json
index ed6283c..8ea8ced 100644
--- a/packages/@headlessui-react/package.json
+++ b/packages/@headlessui-react/package.json
@@ -31,7 +31,8 @@
     "lint": "../../scripts/lint.sh"
   },
   "peerDependencies": {
-    "react": "^16 || ^17"
+    "react": "^16 || ^17 || ^18",
+    "react-dom": "^16 || ^17 || ^18"
   },
   "devDependencies": {
     "@types/react": "^16.14.2",