diff --git a/srcpkgs/hwids/template b/srcpkgs/hwids/template
index 107f09a280..3faca92b29 100644
--- a/srcpkgs/hwids/template
+++ b/srcpkgs/hwids/template
@@ -1,20 +1,28 @@
 # Template file for 'hwids'
 pkgname=hwids
-version=20120524
-homepage="https://github.com/Flameeyes/hwids"
+version=20120730
 revision=1
+noarch=yes
+noextract=yes
+create_wrksrc=yes
 short_desc="Hardware Identification Databases"
 maintainer="Juan RP <xtraeme@gmail.com>"
-noarch=yes
 replaces="pciutils<3.1.9_1 usbutils<005_1"
+homepage="https://github.com/Flameeyes/hwids"
 license="GPL-2"
-distfiles="http://xbps.nopcode.org/distfiles/${pkgname}-${version}.tar.xz"
-checksum=3db843f42711c9138a8b5e00a9408ed9f553fdb01be6f9a19665223d7f03634a
+distfiles="https://github.com/gentoo/${pkgname}/tarball/${pkgname}-${version}"
+checksum=e31bc8e38c29ac1c959f62aad71325103779a3e1ec00965b05d6c72ae632445a
 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_install() {
 	vmkdir usr/share/hwdata
 	install -m644 *.ids ${DESTDIR}/usr/share/hwdata