diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template
index dfe71a0f101..88595299c7a 100644
--- a/srcpkgs/hwids/template
+++ b/srcpkgs/hwids/template
@@ -1,25 +1,17 @@
 # Template file for 'hwids'
 pkgname=hwids
-version=20130512
+version=20130915
 revision=1
-noarch="yes"
+noarch=yes
 create_wrksrc=yes
 replaces="pciutils<3.1.9_1 usbutils<005_1"
 short_desc="Hardware Identification Databases"
 maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="https://github.com/Flameeyes/hwids"
+homepage="https://github.com/gentoo/hwids"
 license="GPL-2"
-distfiles="https://github.com/gentoo/${pkgname}/tarball/${pkgname}-${version}"
-checksum=67d5e01fb2fff2e96345230fab914c8da8a8a535d3162b4907cee3c0f0d466b7
-long_desc="
- The reason to repackage the files together is to make it simpler for applications
- to require them, without having to bring in either pciutils or usbutils, that
- might be unnecessary for most installs."
 
-do_extract() {
-	cd ${wrksrc}
-	tar xf ${XBPS_SRCDISTDIR}/${pkgname}-${version}
-	mv ${wrksrc}/gentoo*/* ${wrksrc}
+do_fetch() {
+	git clone -b hwids-${version} git://github.com/gentoo/hwids hwids-${version}
 }
 
 do_install() {