diff --git a/app-portage/sunrise-commit/Manifest b/app-portage/sunrise-commit/Manifest
--- a/app-portage/sunrise-commit/Manifest
+++ b/app-portage/sunrise-commit/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST sunrise-commit-0.3_pre20101108.tar.bz2 52729 RMD160 49ca5bb6c64f294bc9c50e0a72264091f6a44fab SHA1 d723c1f2f65ae3093cadd20dc7b0e7dd622ad330 SHA256 7dd8321dd24390ee75ffe0abb7e98f1d5200fdba5d7700e1d109cc50135e62e6
-EBUILD sunrise-commit-0.3_pre20101108.ebuild 555 RMD160 bbfb1d975c56ceac674f1ed50d127be231c26ca3 SHA1 af040a32e97ddd1c71d510d64fdc789b526cc047 SHA256 ab38fd247d665bd16053c7ae4941afbbb36a1dd20e5841a7ae4c8ac6965a8702
+DIST sunrise-commit-0.3.tar.bz2 50945 RMD160 d47c224339d3789af606c6e6a20d0ce8795496c3 SHA1 a7707889e84101bdcbbe3c53ab50e3d875c88309 SHA256 4473294e852d7001ccf01d0d7a59467088bced0e0ec960483088c3305789dbad
+EBUILD sunrise-commit-0.3.ebuild 510 RMD160 d5fe26019ca0c82ce58500ddb0c00097d79f2ce0 SHA1 ec12bb23152737d340b9ddd0dc3d8280f4f29946 SHA256 5d806f5536a2d1f2b5e53581a6a6867fd973335a362687f685dd9afd7c1b0197
 MISC metadata.xml 230 RMD160 af7955a6eb304a0b509633a44ff20c595205c882 SHA1 36fe8f30e4ee6236714a9b202b42ab3559850a9d SHA256 845f27140f2de794efd7c2b2d5baae18d208a8f0c996f3a9191635c4259dc70b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNAkflAAoJEHQ6UuhrqBBQZkQP/3D/SkhxAbCSeYsKFfO0hZjZ
-rZRysMQB17SjhjKj5ynNJXkkDal2+efSVfopXGgvZl+k0MpoajocVjs8BErywby2
-yrDO5IgMoboYCT++0i1262C6WQ4ZMZKVQ/sBtRqgvmIeBCBvvT9iN5LqXtarn/Hn
-T7olynXmxPwLSUwN94/2SBrR17y7LRPHZv1ktp0hoCIT69XYtBECG5INDX84otUC
-UoTQheuTjKMklfJL6MmdL1eK2Hcr2bs0x0wR+hEyZSYHvxOlBtUp6C2FT+RGrhO5
-fSZs8Xi9mVRpJ/Q9ypqvi3B4fFDljtQcdRoqxinjpJV9/Nzi59lTHmyUpz5CRrt3
-bpiZFX7j6yup8Ims2VPnL/kI8Q/Rcj7R4nNrTYyoj9NP9OSZh3w26n3WpATYJNFT
-mg6kJUL/wfhHAjtQ5F9jdf7WnXnf3AeuQqCb7mmt4GD+4dHNB4nIfFnW/FrcwzH4
-roOSphPsg9mvTOlpblv+npyFtuKkVs6zJuZljgCzgBM4G/X/t3hFol9MbOuqja+1
-1tqlDXKjpTOHB6bT6TmVRrgJpPr3Qh3QL6SvJqpRqgTJrdf1wb2eGhpV02Uu0LHF
-HR5d1vAXh/N9Auk3gIJtZWcd+3MLPPiL79eEa8s4s+3sYrgwywn7jzxIzIBCK6ja
-fPM1rxkkU4PoG+Q3B++u
-=t3fY
+iQIcBAEBCAAGBQJNG0oDAAoJEHQ6UuhrqBBQEkYP/3KTOlAJ5mm2yGOeB7LDKTqd
+/M19SO3PwhUXZ1V+6v52tzOSPjYxWg49w1K/UVv/yecWUVcmUS6k+mWxoqVApfu0
+rmpzv/clP8j2KpACW7OoEClgWj7wy4CnN7Skoq/JO8rFtTLFDpn4KmzORJFCC5Jj
+FOMxOAufJlIw7W+nHtsj/+r9GIhrypiUCoWP0KDY0iHtrPU32pmaJ+DN1XfvwXup
+YFKRj8iK1nfTIL1ZFzuDBshOZG8hklSttAAviZ2TJ6oZchhHIwIOtnUrmwewNufm
+Mo4mShRs1yaNkBMuz+NeYqN5uV5mOw2GOfzzI71FlIzImO3SN450zakcN293zvM+
+uSIt5J+YwoHmkB+l0OZoZYjmiPZAGew2M+XINxzWsWWf3AsplTzohigaXmj0Ulke
+gU+6e0d5O+5MqRtwc4YGtM/hEnmpmrUVhZTe7JTx3CFAyBoqJZTksibP1OAKP27N
+sSZoz+BTNxxGPnLg+4DD4gsDulilDQXGWvyI53jas/YqIDhLferlf/HrAOTrLKAB
+VYRsLMuwynUkGGrj2lO+Ql1o5al57/At+Bh6Q3m1hZRrSG38yUqAGtzqkGPSDxBB
+L50R6TdiLlkO0o+1VUix75ImEqVCfH9R+zdKBlxkTC+bXlhjv4GPPvSAFAHj/7Rp
+Wr/XFyW3m8tIwhBlBqvm
+=XsGv
 -----END PGP SIGNATURE-----
diff --git a/app-portage/sunrise-commit/sunrise-commit-0.3_pre20101108.ebuild b/app-portage/sunrise-commit/sunrise-commit-0.3.ebuild
rename from app-portage/sunrise-commit/sunrise-commit-0.3_pre20101108.ebuild
rename to app-portage/sunrise-commit/sunrise-commit-0.3.ebuild
--- a/app-portage/sunrise-commit/sunrise-commit-0.3_pre20101108.ebuild
+++ b/app-portage/sunrise-commit/sunrise-commit-0.3.ebuild
@@ -4,11 +4,11 @@
 
 EAPI=2
 
-inherit base versionator
+inherit base
 
 DESCRIPTION="Script for committing to the sunrise overlay and other Gentoo repositories"
 HOMEPAGE="http://github.com/mgorny/sunrise-commit/"
-SRC_URI="ftp://ohnopub.net/mirror/${P}.tar.bz2"
+SRC_URI="http://cloud.github.com/downloads/mgorny/${PN}/${P}.tar.bz2"
 LICENSE="BSD"
 
 SLOT="0"
@@ -18,5 +18,3 @@ IUSE=""
 RDEPEND="!!app-portage/overlay-utils
 	>=app-portage/gentoolkit-dev-0.2.7
 	sys-apps/portage"
-
-S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)