diff --git a/mail/c-sig/Makefile b/mail/c-sig/Makefile
index f65915a35160..d6276d3d2a1d 100644
--- a/mail/c-sig/Makefile
+++ b/mail/c-sig/Makefile
@@ -2,12 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	c-sig
-PORTVERSION=	3.8
-PORTREVISION=	20
+PORTVERSION=	3.8.0.1
 CATEGORIES=	mail elisp
-MASTER_SITES=	LOCAL/tota/${PORTNAME}
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
-DISTNAME=	${PORTNAME}.${PORTVERSION}
 
 MAINTAINER=	yasu@utahime.org
 COMMENT=	Signature insertion tool for Emacs
@@ -15,19 +12,14 @@ COMMENT=	Signature insertion tool for Emacs
 LICENSE=	GPLv2+
 
 USES=		emacs
+USE_GITHUB=	yes
+GH_ACCOUNT=	yasuhirokimura
+NO_ARCH=	yes
 
-NO_WRKSUBDIR=	yes
-
-OPTIONS_DEFINE=	DOCS
-
+MAKE_ENV+=	EMACS=${EMACS_CMD} LISPDIR=${LISPDIR}
 LISPDIR=	${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
 
-do-build:
-	cd ${WRKSRC}; ${EMACS_CMD} -batch -q -f batch-byte-compile c-sig.el
-
-do-install:
-	@${MKDIR} ${STAGEDIR}${LISPDIR}
-	${INSTALL_DATA} ${WRKSRC}/c-sig.el* ${STAGEDIR}${LISPDIR}
+post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in c-sig-eng.faq c-sig-eng.man c-sig-jp.faq c-sig-jp.man
 	${INSTALL_MAN} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
diff --git a/mail/c-sig/distinfo b/mail/c-sig/distinfo
index 85168d7b508b..4ae6eb6c89ac 100644
--- a/mail/c-sig/distinfo
+++ b/mail/c-sig/distinfo
@@ -1,2 +1,3 @@
-SHA256 (c-sig.3.8.tar.gz) = cb035108a6b1006a2c3bcf7e6b9d759c826d54966b345728e24fb73dd88db3fa
-SIZE (c-sig.3.8.tar.gz) = 21827
+TIMESTAMP = 1529399373
+SHA256 (yasuhirokimura-c-sig-3.8.0.1_GH0.tar.gz) = e4d89193dd179710c72240e2d8e658078cdaf4b87408d505cd376d3eeab0dea8
+SIZE (yasuhirokimura-c-sig-3.8.0.1_GH0.tar.gz) = 24931
diff --git a/mail/c-sig/pkg-descr b/mail/c-sig/pkg-descr
index 059d1683525d..638053efe37a 100644
--- a/mail/c-sig/pkg-descr
+++ b/mail/c-sig/pkg-descr
@@ -6,3 +6,5 @@ features:
 - Powerful retrieval and learning function.
 - c-sig can convert text automatically when insertion.
 - signatures can be modified by emacs lisp.
+
+WWW: https://github.com/yasuhirokimura/c-sig
diff --git a/mail/c-sig/pkg-plist b/mail/c-sig/pkg-plist
index b851fba47951..a1341723fa0a 100644
--- a/mail/c-sig/pkg-plist
+++ b/mail/c-sig/pkg-plist
@@ -1,6 +1,6 @@
 %%EMACS_VERSION_SITE_LISPDIR%%/c-sig/c-sig.el
 %%EMACS_VERSION_SITE_LISPDIR%%/c-sig/c-sig.elc
-%%PORTDOCS%%%%DOCSDIR%%/c-sig-eng.faq
-%%PORTDOCS%%%%DOCSDIR%%/c-sig-eng.man
-%%PORTDOCS%%%%DOCSDIR%%/c-sig-jp.faq
-%%PORTDOCS%%%%DOCSDIR%%/c-sig-jp.man
+%%DOCSDIR%%/c-sig-eng.faq
+%%DOCSDIR%%/c-sig-eng.man
+%%DOCSDIR%%/c-sig-jp.faq
+%%DOCSDIR%%/c-sig-jp.man