diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index fff5698e7..954d086de 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1,3 +1,5 @@
 DIST MechanicalSoup-0.6.0.zip 5286 BLAKE2B 93a1d124cd45820e425fcb50b2aec04026f7a6f42c7c3f5c93103fbd216c98e36f366a1f7f343dd5561688ac4adb6feacab08ae444f91156348c07a80710a306 SHA512 cc413723514f3beee1267c57c16f6de2c19eb1f64535a60b546d289c7c18d8c4ba752ea61ab0b4a2aead2b56b12639cd226cb32662622515cb40262b7e619c24
-EBUILD MechanicalSoup-0.6.0.ebuild 1371 BLAKE2B a246d2543b3919e09cf24a3b0de2f9b5af3305222365490c94e1735b95f7bf90edd7129d1a32e7a60607a1568708f97f1e02faf8d4e6feab63cabe5020bec23a SHA512 91cd0291bfbbc61890b3f2fc02ea2d59be92aac52644de47b97f4bbd7525a0c93b582789150f72191098510980ad36d43d7b2acfbe2195790e6b54b588b16680
-MISC metadata.xml 550 BLAKE2B e580cc1c3eea5cd7a96ff564c5bb7606498911f997c326cd962ea54e7c73e6521b08d22a7de40f5a7784f3a6386aaaa6d8146ce64d8bcdc4d5f3f42a1855f821 SHA512 cf6d0689bb22256e261d2b964ec9ad05508467f68a115ded56b73fe27dad9f15f53a202f6c71e36b6219a5e79d99e01befa04bf239637f16ced3658d41d06314
+DIST MechanicalSoup-1.1.0.tar.gz 49270 BLAKE2B 947b35d819dc69508595adcfe5a0c8e6bd34888c995e9c3931613498ee1ca840ce16a14359aacbf9d40aa4f9ae59d45d14da5a150e3ce39ae7e72f587c94820e SHA512 26eaa54bcd1c0aac26504d7c482ed001830a1c79bf48a3055cef92348e9336887bef86cda68281911032159a3404a1f4ee8de9b6516d7d767cfd6b3b380c4ebe
+EBUILD MechanicalSoup-0.6.0.ebuild 1365 BLAKE2B f65155d17fa5d7f9b1923373b72e9a02eba6055f4002b342b2aca88337097228d17fe1c19cb44d547cd8e34e51e5b95f8e8846bb7b99141fa33c2dbec6d17567 SHA512 0a6ca19edec62aefab352efadf14c74f62f7a2addc1b254717ae280b9cbf0cb6cc2ec125324d8073b194a624362675e86cd3704b58de92d130643248ee89bf9f
+EBUILD MechanicalSoup-1.1.0.ebuild 1364 BLAKE2B 889262a8128c8a8320a078d1dd68a3c87c916092d64976e78f07cdc6fb17688ff959696370e43a85d121db764c6468ae404e90a799166e594431ad16d4ad1b3d SHA512 7f4628b4d4165e233c129fbf116dd3053db79bb75548a3e0c52fd69647084484187219716b517b436bb620142dce7bf0f074a3323618363457e3246ad73d38f3
+MISC metadata.xml 333 BLAKE2B f1242ae542b7e0898d1947f4630968f9f3062181bd50d727f7620118b6e1e63f47958a231817512890a3a9337807566fdba454c4d2d0b8013fb44f30a0398837 SHA512 57df856e5d6d2946d5361d6226ccb1d250d9e1981dcf709fd1a86d06b091f9817b720717f64fcea363b7f988ea0c8b5f2f8407f09f61980a96f90b6b9def9c8e
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
index 5904f8843..27a0f3f59 100644
--- a/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
+++ b/dev-python/MechanicalSoup/MechanicalSoup-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
new file mode 100644
index 000000000..8a61ec31e
--- /dev/null
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.1.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python library for automating interaction with websites"
+HOMEPAGE="https://pypi.org/project/MechanicalSoup/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+DOCS="README.rst"
+
+RDEPEND=">=dev-python/beautifulsoup4-4.7[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/requests-mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# We don't need pytest-runner to run tests via pytest
+	sed -i "s/'pytest-runner'//" setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Override pytest options to skip coverage and flake8
+	pytest -vv --override-ini="addopts=" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/MechanicalSoup/metadata.xml b/dev-python/MechanicalSoup/metadata.xml
index 1565f268e..8bb632775 100644
--- a/dev-python/MechanicalSoup/metadata.xml
+++ b/dev-python/MechanicalSoup/metadata.xml
@@ -1,16 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">MechanicalSoup</remote-id>
-		<remote-id type="github">MechanicalSoup/MechanicalSoup</remote-id>
-		<bugs-to>https://github.com/MechanicalSoup/MechanicalSoup/issues</bugs-to>
-	</upstream>
+  <maintainer type="project">
+    <email>b@edevau.net</email>
+    <name>Andreas Billmeier</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">MechanicalSoup</remote-id>
+  </upstream>
 </pkgmetadata>