diff -urN /usr/ports/net-im/cjc/Makefile net-im/cjc/Makefile
--- /usr/ports/net-im/cjc/Makefile	2013-12-16 02:24:28.000000000 +0900
+++ net-im/cjc/Makefile	2013-12-17 00:00:00.000000000 +0900
@@ -4,7 +4,7 @@
 PORTNAME=	cjc
 PORTVERSION=	1.2.1
 CATEGORIES=	net-im python
-MASTER_SITES=	http://cloud.github.com/downloads/Jajcus/cjc/
+MASTER_SITES=	GHC
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Console Jabber Client
@@ -13,29 +13,30 @@
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyxmpp>=1.1.0:${PORTSDIR}/net-im/py-pyxmpp
 
+OPTIONS_DEFINE=	DOCS
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	Jajcus
+
+WRKSRC=		${WRKDIR}/${DISTNAME}
+
+USES=		shebangfix
+SHEBANG_FILES=	cjc.in cjc.py cjc/main.py
 USE_PYTHON=	2
 
-NO_STAGE=	yes
+.include <bsd.port.options.mk>
+
 post-patch:
-	@${GREP} -lR "/usr/bin/python" ${WRKSRC} | ${XARGS} \
-		${REINPLACE_CMD} -e "s|/usr/bin/python|${PYTHON_CMD}|"
 	@${REINPLACE_CMD} -e \
 		"s|prefix=.*|prefix=${PREFIX}| ; \
-		 /pkg_docdir/s|^|#|g ; \
+		 /^DOCS/s|COPYING|| ; \
 		 s|INSTALL=.*|INSTALL=${INSTALL}| ; \
 		 s|INSTALL_DATA=.*|INSTALL_DATA=${INSTALL_DATA}| ; \
 		 s|INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|g ; \
-		 s|python |${PYTHON_CMD} |g" ${WRKSRC}/Makefile
-
-.include <bsd.port.options.mk>
+		 /compileall/d" ${WRKSRC}/Makefile
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
-.endif
+	(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
+		-d ${PREFIX} -f ${DATADIR_REL})
 
 .include <bsd.port.mk>