Index: sysutils/istatd/Makefile
===================================================================
--- sysutils/istatd/Makefile
+++ sysutils/istatd/Makefile
@@ -5,20 +5,25 @@
 PORTVERSION=	0.5.8
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://cloud.github.com/downloads/tiwilliam/${PORTNAME}/
+MASTER_SITES= GHC
 
 MAINTAINER=	farrokhi@FreeBSD.org
 COMMENT=	Daemon for iStat iPhone application
 
+LICENSE=    BSD3CLAUSE
+
 LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
 
+USE_GITHUB= yes
+GH_ACCOUNT= tiwilliam
+
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	${PORTNAME}
 
 PLIST_FILES=	bin/istatd etc/istat.conf-dist man/man1/istatd.1.gz \
 		man/man5/istat.conf.5.gz
 
-SUB_FILES+=	pkg-message
+SUB_FILES=	pkg-message
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/istatd ${STAGEDIR}${PREFIX}/bin
Index: sysutils/istatd/files/patch-istat.conf
===================================================================
--- sysutils/istatd/files/patch-istat.conf
+++ /dev/null
@@ -1,18 +0,0 @@
---- resource/istat.conf.orig
-+++ resource/istat.conf
-@@ -5,11 +5,11 @@
- # network_addr           127.0.0.1
- # network_port           5109
- server_code              12345
--# server_user            istat
--# server_group           istat
-+server_user              nobody
-+server_group             nobody
- # server_socket          /tmp/istatd.sock
--# server_pid             /var/run/istat/istatd.pid
--# cache_dir              /var/cache/istat
-+server_pid               /var/run/istatd.pid
-+cache_dir                /var/db/istatd
- 
- # Note: Only support for one network interface, limited by client.
- monitor_net              ( eth0 )
Index: sysutils/istatd/files/patch-resource_istat.conf
===================================================================
--- /dev/null
+++ sysutils/istatd/files/patch-resource_istat.conf
@@ -0,0 +1,18 @@
+--- resource/istat.conf.orig	2011-12-27 23:06:51 UTC
++++ resource/istat.conf
+@@ -5,11 +5,11 @@
+ # network_addr           127.0.0.1
+ # network_port           5109
+ server_code              12345
+-# server_user            istat
+-# server_group           istat
++server_user              nobody
++server_group             nobody
+ # server_socket          /tmp/istatd.sock
+-# server_pid             /var/run/istat/istatd.pid
+-# cache_dir              /var/cache/istat
++server_pid               /var/run/istatd.pid
++cache_dir                /var/db/istatd
+ 
+ # Note: Only support for one network interface, limited by client.
+ monitor_net              ( eth0 )