diff --git a/sys-devel/spl/Manifest b/sys-devel/spl/Manifest
index 924d147..8cefccb 100644
--- a/sys-devel/spl/Manifest
+++ b/sys-devel/spl/Manifest
@@ -1,4 +1,4 @@
 AUX spl-0.6.0-includedir.patch 1179 RMD160 cade3b696d6981b2583cc5ae8ecf614d38ef2efc SHA1 2c5ce007df75a7a8425e1a28308eefdcb29446c2 SHA256 8d05fc006348264e1633e14b73e022d482164d6cefc8d2425faffc50d2346150
 DIST spl-0.6.0-rc6.tar.gz 438215 RMD160 8acfc2f7817993f561e78e6627eab22555d8ed27 SHA1 7cdbf313ccae73b382022da408eb17d6a612dd5b SHA256 a728ec0e5db9260d48e8165d3ac6f783b17812fca7b87966fae085c9e7a48446
 EBUILD spl-0.6.0_rc6.ebuild 1007 RMD160 cdbf9d35749584ec03f629cb056f7d667ceb2268 SHA1 e2ac30a80e61ec2c31afaefa87707163abf25b53 SHA256 25e2e25924c18ec112842b917202da8dd97989ca3175e79b824811066ea3d6f3
-EBUILD spl-9999.ebuild 953 RMD160 14b225e61eadbb4840438e81413e33c5f6b09e11 SHA1 bc78b6f785bdeb646d6221e02be5b6022e164b30 SHA256 74be89da35d2492994a82f4ad8d707ad11d63693974d38fac90478493273c7e1
+EBUILD spl-9999.ebuild 937 RMD160 264271eef05434a09873bc421c04361617ab4954 SHA1 743df906867e4a15e8ea8713bf8aea5c7fe7ab7b SHA256 f429140c1d75c809c8c960c8eabbc0c76b5c89e1ebd6f048e64acb4a0fb274d2
diff --git a/sys-devel/spl/spl-9999.ebuild b/sys-devel/spl/spl-9999.ebuild
index 242454d..e974f4b 100644
--- a/sys-devel/spl/spl-9999.ebuild
+++ b/sys-devel/spl/spl-9999.ebuild
@@ -9,9 +9,9 @@ AT_M4DIR=./config  # for aclocal called by eautoreconf
 inherit git-2 linux-info eutils autotools
 
 DESCRIPTION="Solaris Porting Layer - a Linux kernel module providing some Solaris kernel APIs"
-HOMEPAGE="http://wiki.github.com/behlendorf/spl/"
+HOMEPAGE="http://zfsonlinux.org/"
 SRC_URI=""
-EGIT_REPO_URI="git://github.com/behlendorf/spl.git"
+EGIT_REPO_URI="git://github.com/zfsonlinux/spl.git"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 9fc2e86..0b13311 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,5 +1,5 @@
 AUX zfs-0.6.0-includedir.patch 586 RMD160 eb4cc6a9d66721e70c932b1dd640abd852d5470d SHA1 c673e057008b4cb7d4c45b936533e9bceff2443c SHA256 047a0cec35bcc5f8050fa80f8203ea020bf148375297c64300a9607f062cec2d
 AUX zfs.initd 2052 RMD160 3636ead94d4b7200cc221b9e9646b85a5c3acc1a SHA1 d59d5b475c3dc335bf70a24a7af80ef7a38df347 SHA256 ad5e5aa282f2942b23364b5dcb43b4edea5c3923559d18d624ca9bcb51218476
 DIST zfs-0.6.0-rc6.tar.gz 1936503 RMD160 c5bcaa967fe70f5c72863f9e230850b37d76b8ce SHA1 70e6d4a6c97281df52e9c91ae577d15637804934 SHA256 b4f72580307d8b81fa9568fd46dccc993367402bf085adb9eca4dd1a24f323e0
-EBUILD zfs-0.6.0_rc6.ebuild 1581 RMD160 23b9323d01e65dcf68cb7f64e0353e46b252851d SHA1 6e83d474371d3dbf206aea1d4ee757a8c36b337d SHA256 ca9f47d17df5f280700357346ed199c4bfb0e872db626add82c8f5bee8ec6c69
-EBUILD zfs-9999.ebuild 1501 RMD160 7eb8dd1b10f630c185cd34af2e47cc62f724d5e0 SHA1 0d395edb45c17299cdfeb802cbeee71c7ccb0f63 SHA256 823186b39fd991674798b7ad6327fb713445376a4970abd0e21abe8beb06108d
+EBUILD zfs-0.6.0_rc6.ebuild 1581 RMD160 f2792e1dd837425ba509176abbbcc34d9badc937 SHA1 bb98600e0b6944d2c77183da7ae7c4b6b760eb8c SHA256 0dbfc7ea982d4e8d243b8dc8c4b5a2aa430c9c846baba42f6a819126e87d2713
+EBUILD zfs-9999.ebuild 1485 RMD160 304a5d868949113257b907bb76b55f940f60ab56 SHA1 74c6e49fcd9b4dc697da25831e80f3d108642d9c SHA256 e2013536cb7d1873d867c60fcf9d910ad1754441ebbe71bbe45be17e0a96d97a
diff --git a/sys-fs/zfs/zfs-0.6.0_rc6.ebuild b/sys-fs/zfs/zfs-0.6.0_rc6.ebuild
index 37d63ca..3075666 100644
--- a/sys-fs/zfs/zfs-0.6.0_rc6.ebuild
+++ b/sys-fs/zfs/zfs-0.6.0_rc6.ebuild
@@ -33,7 +33,7 @@ pkg_setup() {
 	linux_config_exists || die "Your kernel sources are unconfigured."
 	if linux_chkconfig_present PREEMPT; then
 		eerror "${CATEGORY}/${PN} doesn't currently work with PREEMPT kernel."
-		eerror "Please look at bug https://github.com/behlendorf/zfs/issues/83"
+		eerror "Please look at bug https://github.com/zfsonlinux/zfs/issues/83"
 		die "PREEMPT kernel"
 	fi
 }
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 406439b..2b03dac 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -7,12 +7,12 @@ EAPI="2"
 WANT_AUTOMAKE="1.11"
 AT_M4DIR=./config  # for aclocal called by eautoreconf
 
-EGIT_REPO_URI="http://github.com/behlendorf/zfs.git"
+EGIT_REPO_URI="http://github.com/zfsonlinux/zfs.git"
 
 inherit autotools eutils git-2 linux-mod
 
 DESCRIPTION="Native ZFS for Linux"
-HOMEPAGE="http://wiki.github.com/behlendorf/zfs/"
+HOMEPAGE="http://zfsonlinux.org/"
 SRC_URI=""
 
 LICENSE="CDDL GPL-2"
@@ -34,7 +34,7 @@ pkg_setup() {
 	linux_config_exists || die "Your kernel sources are unconfigured."
 	if linux_chkconfig_present PREEMPT; then
 		eerror "${CATEGORY}/${PN} doesn't currently work with PREEMPT kernel."
-		eerror "Please look at bug https://github.com/behlendorf/zfs/issues/83"
+		eerror "Please look at bug https://github.com/zfsonlinux/zfs/issues/83"
 		die "PREEMPT kernel"
 	fi
 }