diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index 144eec18dd8a..7857c85336ee 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	sqlgrey
-PORTVERSION=	1.7.6
+DISTVERSION=	1.8.0-rc2
 CATEGORIES=	mail
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-1.7%20%28devel%29/${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-1.8%20%28stable%29
 
 MAINTAINER=	chifeng@gmail.com
 COMMENT=	Greylisting policy server for Postfix using an SQL backend
@@ -18,8 +18,7 @@ RUN_DEPENDS=	${SITE_PERL}/Net/Server.pm:${PORTSDIR}/net/p5-Net-Server \
 		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-Pod-Parser
 
 USE_PERL5_RUN=	yes
-USE_RC_SUBR=	sqlgrey.sh
-USE_BZIP2=	yes
+USE_RC_SUBR=	sqlgrey
 NO_BUILD=	yes
 
 ETCFILES=	clients_fqdn_whitelist clients_ip_whitelist dyn_fqdn.regexp smtp_server.regexp sqlgrey.conf
diff --git a/mail/sqlgrey/distinfo b/mail/sqlgrey/distinfo
index e723cda260ce..7e264b92feee 100644
--- a/mail/sqlgrey/distinfo
+++ b/mail/sqlgrey/distinfo
@@ -1,3 +1,2 @@
-MD5 (sqlgrey-1.7.6.tar.bz2) = 1e7e5e3ed5f02b29f71ef4e26edc1c36
-SHA256 (sqlgrey-1.7.6.tar.bz2) = 48f6c855e18d3ac3d19a0c2ecd250394a355d0116acd631187b880cb813646d1
-SIZE (sqlgrey-1.7.6.tar.bz2) = 63738
+SHA256 (sqlgrey-1.8.0-rc2.tar.gz) = c109aab28c9dcf798beb708d1efa37facfb3dfacd0f15fa87b5f6c1f023d2068
+SIZE (sqlgrey-1.8.0-rc2.tar.gz) = 68821
diff --git a/mail/sqlgrey/files/sqlgrey.sh.in b/mail/sqlgrey/files/sqlgrey.in
similarity index 100%
rename from mail/sqlgrey/files/sqlgrey.sh.in
rename to mail/sqlgrey/files/sqlgrey.in