diff --git a/stubs/webencodings/@tests/stubtest_allowlist.txt b/stubs/webencodings/@tests/stubtest_allowlist.txt
deleted file mode 100644
index a7af9d8760da..000000000000
--- a/stubs/webencodings/@tests/stubtest_allowlist.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Tests should not be part of the stubs
-webencodings.tests
diff --git a/stubs/webencodings/METADATA.toml b/stubs/webencodings/METADATA.toml
index af406126c763..0df49ecd99fb 100644
--- a/stubs/webencodings/METADATA.toml
+++ b/stubs/webencodings/METADATA.toml
@@ -1,2 +1,2 @@
-version = "0.5.*"
-upstream-repository = "https://github.com/gsnedders/python-webencodings"
+version = "0.6.*"
+upstream-repository = "https://github.com/CourtBouillon/webencodings"
diff --git a/stubs/webencodings/webencodings/__init__.pyi b/stubs/webencodings/webencodings/__init__.pyi
index c9f078493786..16c92fb23b7a 100644
--- a/stubs/webencodings/webencodings/__init__.pyi
+++ b/stubs/webencodings/webencodings/__init__.pyi
@@ -3,6 +3,7 @@ from collections.abc import Iterable, Iterator
 from typing import Final
 
 VERSION: Final[str]
+__version__: Final[str]
 PYTHON_NAMES: Final[dict[str, str]]
 CACHE: dict[str, Encoding]
 
diff --git a/stubs/webencodings/webencodings/custom.pyi b/stubs/webencodings/webencodings/custom.pyi
new file mode 100644
index 000000000000..02006b3b4dbf
--- /dev/null
+++ b/stubs/webencodings/webencodings/custom.pyi
@@ -0,0 +1,48 @@
+import codecs
+from _codecs import _CharMap
+from _typeshed import ReadableBuffer
+from typing import ClassVar, Final
+
+class Codec(codecs.Codec):
+    encoding_table: ClassVar[_CharMap | str | None]
+    decoding_table: ClassVar[_CharMap | str | None]
+    def encode(self, input: str, errors: str = "strict") -> tuple[bytes, int]: ...
+    def decode(self, input: bytes, errors: str = "strict") -> tuple[str, int]: ...
+
+class IncrementalEncoder(codecs.IncrementalEncoder):
+    encoding_table: ClassVar[_CharMap | str | None]
+    def encode(self, input: str, final: bool = False) -> bytes: ...
+
+class IncrementalDecoder(codecs.IncrementalDecoder):
+    decoding_table: ClassVar[_CharMap | str | None]
+    def decode(self, input: ReadableBuffer, final: bool = False) -> str: ...
+
+class StreamWriter(Codec, codecs.StreamWriter): ...
+class StreamReader(Codec, codecs.StreamReader): ...
+
+user_decoding_table: Final[str]
+user_encoding_table: Final[_CharMap]
+
+class UserCodec(Codec):
+    decoding_table: ClassVar[str]
+    encoding_table: ClassVar[_CharMap]
+
+class UserIncrementalEncoder(IncrementalEncoder):
+    encoding_table: ClassVar[_CharMap]
+
+class UserIncrementalDecoder(IncrementalDecoder):
+    decoding_table: ClassVar[str]
+
+user_codec_info: Final[codecs.CodecInfo]
+
+class ReplacementCodec(Codec):
+    decoding_table: ClassVar[str]
+    encoding_table: ClassVar[str]
+
+class ReplacementIncrementalEncoder(IncrementalEncoder):
+    encoding_table: ClassVar[str]
+
+class ReplacementIncrementalDecoder(IncrementalDecoder):
+    decoding_table: ClassVar[str]
+
+replacement_codec_info: Final[codecs.CodecInfo]
diff --git a/stubs/webencodings/webencodings/mklabels.pyi b/stubs/webencodings/webencodings/mklabels.pyi
deleted file mode 100644
index 839692415fbd..000000000000
--- a/stubs/webencodings/webencodings/mklabels.pyi
+++ /dev/null
@@ -1,5 +0,0 @@
-from typing import AnyStr
-from urllib.request import Request
-
-def assert_lower(string: AnyStr) -> AnyStr: ...
-def generate(url: str | Request) -> str: ...
diff --git a/stubs/webencodings/webencodings/x_user_defined.pyi b/stubs/webencodings/webencodings/x_user_defined.pyi
deleted file mode 100644
index bb67491c8606..000000000000
--- a/stubs/webencodings/webencodings/x_user_defined.pyi
+++ /dev/null
@@ -1,21 +0,0 @@
-import codecs
-from _codecs import _CharMap
-from _typeshed import ReadableBuffer
-from typing import Final
-
-class Codec(codecs.Codec):
-    def encode(self, input: str, errors: str = "strict") -> tuple[bytes, int]: ...
-    def decode(self, input: bytes, errors: str = "strict") -> tuple[str, int]: ...
-
-class IncrementalEncoder(codecs.IncrementalEncoder):
-    def encode(self, input: str, final: bool = False) -> bytes: ...
-
-class IncrementalDecoder(codecs.IncrementalDecoder):
-    def decode(self, input: ReadableBuffer, final: bool = False) -> str: ...
-
-class StreamWriter(Codec, codecs.StreamWriter): ...
-class StreamReader(Codec, codecs.StreamReader): ...
-
-codec_info: Final[codecs.CodecInfo]
-decoding_table: Final[str]
-encoding_table: Final[_CharMap]