diff --git a/lib/solaar/ui/about.py b/lib/solaar/ui/about.py
index 6d8ce5e3..2c860c24 100644
--- a/lib/solaar/ui/about.py
+++ b/lib/solaar/ui/about.py
@@ -75,7 +75,7 @@ def _create():
 					'Dimitriy Ryazantcev (Russian)',
 					)))
 
-	about.set_website('http://pwr.github.io/Solaar/')
+	about.set_website('http://pwr-solaar.github.io/Solaar/')
 	about.set_website_label(NAME)
 
 	about.connect('response', lambda x, y: x.hide())
diff --git a/packaging/debian/control b/packaging/debian/control
index 9a8a0d00..0ff9204d 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -7,7 +7,7 @@ Build-Depends-Indep: python, po-debconf
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.2
 Standards-Version: 3.9.4
-Homepage: http://pwr.github.io/Solaar
+Homepage: http://pwr-solaar.github.io/Solaar
 Vcs-Git: git://github.com/pwr/Solaar.git
 Vcs-browser: http://github.com/pwr/Solaar
 
diff --git a/packaging/gentoo/solaar-0.8.8.1.ebuild b/packaging/gentoo/solaar-0.8.8.1.ebuild
index 9a0537fc..b9812240 100644
--- a/packaging/gentoo/solaar-0.8.8.1.ebuild
+++ b/packaging/gentoo/solaar-0.8.8.1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_2} )
 inherit distutils-r1 udev user linux-info gnome2-utils
 
 DESCRIPTION="Solaar is a Linux device manager for Logitech's Unifying Receiver peripherals"
-HOMEPAGE="http://pwr.github.io/Solaar/"
+HOMEPAGE="http://pwr-solaar.github.io/Solaar/"
 SRC_URI="https://github.com/pwr/Solaar/archive/${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/setup.py b/setup.py
index 9260e1d9..1be76ff3 100755
--- a/setup.py
+++ b/setup.py
@@ -55,7 +55,7 @@ battery status.
 		author='Daniel Pavel',
 		author_email='daniel.pavel@gmail.com',
 		license='GPLv2',
-		url='http://pwr.github.io/Solaar/',
+		url='http://pwr-solaar.github.io/Solaar/',
 		classifiers=[
 			'Development Status :: 4 - Beta',
 			'Environment :: X11 Applications :: GTK',