diff --git a/kvmd/PKGBUILD b/kvmd/PKGBUILD
index e879f349..9be5fa5b 100644
--- a/kvmd/PKGBUILD
+++ b/kvmd/PKGBUILD
@@ -7,7 +7,7 @@ pkgver="0.38"
 pkgrel="1"
 pkgdesc="The main Pi-KVM daemon"
 arch=("any")
-url="https://github.com/mdevaev/pi-kvm"
+url="https://github.com/pi-kvm/pi-kvm"
 license=("GPL")
 depends=(
 	"python"
diff --git a/kvmd/setup.py b/kvmd/setup.py
index 69f868b3..90c279e0 100755
--- a/kvmd/setup.py
+++ b/kvmd/setup.py
@@ -12,7 +12,7 @@ def main() -> None:
     setup(
         name="kvmd",
         version="0.38",
-        url="https://github.com/mdevaev/pi-kvm",
+        url="https://github.com/pi-kvm/pi-kvm",
         license="GPLv3",
         author="Maxim Devaev",
         author_email="mdevaev@gmail.com",
diff --git a/kvmd/web/index.html b/kvmd/web/index.html
index 1126cfbb..bf8a7d7c 100644
--- a/kvmd/web/index.html
+++ b/kvmd/web/index.html
@@ -329,7 +329,7 @@
 
 	<ul id="footer">
 		<li id="kvmd-version" class="footer-left"></li>
-		<li class="footer-right"><a target="_blank" href="https://github.com/mdevaev/pi-kvm">Pi-KVM Project</a></li>
+		<li class="footer-right"><a target="_blank" href="https://github.com/pi-kvm">Pi-KVM Project</a></li>
 	</ul>
 </body>
 </html>