diff --git a/README.md b/README.md
index 17b145b..9c7228b 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # AsyncTCP
-![Build Status](https://github.com/esphome/AsyncTCP/actions/workflows/push.yml/badge.svg)
+![Build Status](https://github.com/mathieucarbou/AsyncTCP/actions/workflows/push.yml/badge.svg)
 A fork of the [AsyncTCP](https://github.com/me-no-dev/AsyncTCP) library by [@me-no-dev](https://github.com/me-no-dev) for [ESPHome](https://esphome.io).
 
 ### Async TCP Library for ESP32 Arduino
@@ -10,3 +10,9 @@ This library is the base for [ESPAsyncWebServer](https://github.com/me-no-dev/ES
 
 ## AsyncClient and AsyncServer
 The base classes on which everything else is built. They expose all possible scenarios, but are really raw and require more skills to use.
+
+## Changes in this fork
+
+- All improvements from [ESPHome fork](https://github.com/esphome/AsyncTCP)
+- Reverted back `library.properties` for Arduino IDE users
+- Arduino 3 / ESP-IDF 5 compatibility
diff --git a/library.json b/library.json
index 52819dc..ae21731 100644
--- a/library.json
+++ b/library.json
@@ -1,16 +1,21 @@
 {
-  "name": "AsyncTCP-esphome",
+  "name": "AsyncTCP",
+  "version": "3.0.0",
   "description": "Asynchronous TCP Library for ESP32",
   "keywords": "async,tcp",
-  "authors": {
-    "name": "Hristo Gochkov",
-    "maintainer": true
-  },
   "repository": {
     "type": "git",
-    "url": "https://github.com/esphome/AsyncTCP.git"
+    "url": "https://github.com/mathieucarbou/AsyncTCP.git"
   },
-  "version": "2.1.3",
+  "authors": [
+    {
+      "name": "Hristo Gochkov"
+    },
+    {
+      "name": "Mathieu Carbou",
+      "maintainer": true
+    }
+  ],
   "license": "LGPL-3.0",
   "frameworks": "arduino",
   "platforms": [
@@ -19,5 +24,15 @@
   ],
   "build": {
     "libCompatMode": 2
+  },
+  "export": {
+    "include": [
+      "examples",
+      "src",
+      "library.json",
+      "library.properties",
+      "LICENSE",
+      "README.md"
+    ]
   }
-}
+}
\ No newline at end of file
diff --git a/library.properties b/library.properties
index ea7eeb1..140f60e 100644
--- a/library.properties
+++ b/library.properties
@@ -1,9 +1,9 @@
-me=AsyncTCP-esphome
-version=2.1.3
+me=AsyncTCP
+version=3.0.0
 author=Me-No-Dev
-maintainer=ESPHome
+maintainer=Mathieu Carbou <mathieu.carbou@gmail.com>
 sentence=Async TCP Library for ESP32
 paragraph=Async TCP Library for ESP32
 category=Other
-url=https://github.com/esphome/AsyncTCP.git
+url=https://github.com/mathieucarbou/AsyncTCP.git
 architectures=*
diff --git a/src/AsyncTCP.h b/src/AsyncTCP.h
index 268fb78..289db44 100644
--- a/src/AsyncTCP.h
+++ b/src/AsyncTCP.h
@@ -22,6 +22,12 @@
 #ifndef ASYNCTCP_H_
 #define ASYNCTCP_H_
 
+#define ASYNCTCP_VERSION "3.0.0"
+#define ASYNCTCP_VERSION_MAJOR 0
+#define ASYNCTCP_VERSION_MINOR 0
+#define ASYNCTCP_VERSION_REVISION 0
+#define ASYNCTCP_FORK_mathieucarbou
+
 #include "IPAddress.h"
 #if ESP_IDF_VERSION_MAJOR < 5
 #include "IPv6Address.h"