diff --git a/comms/bluegps/Makefile b/comms/bluegps/Makefile
index edf700d817e4..8bd613348425 100644
--- a/comms/bluegps/Makefile
+++ b/comms/bluegps/Makefile
@@ -1,19 +1,19 @@
-# New ports collection makefile for:   bluegps
-# Date created:                29 July 2007
-# Whom:                        dirkx@webweaving.org
-#
+# Created by: dirkx@webweaving.org
 # $FreeBSD$
-#
 
-PORTNAME=      bluegps-linux
-PORTVERSION=   2.0
-CATEGORIES=    comms
-MASTER_SITES=  http://www.harbaum.org/till/bluegps/
-EXTRACT_SUFX=  .tgz
+PORTNAME=	bluegps-linux
+PORTVERSION=	2.0
+CATEGORIES=	comms
+MASTER_SITES=	http://www.harbaum.org/till/bluegps/
+EXTRACT_SUFX=	.tgz
 
-MAINTAINER=    dirkx@webweaving.org
-COMMENT=       Command line tool to download datalogs from the Royaltek RBT-3000 bluetooth GPS receiver
+MAINTAINER=	dirkx@webweaving.org
+COMMENT=	Command line tool to download datalogs from the Royaltek RBT-3000 bluetooth GPS receiver
 
-MAN1=          bluegps.1
+MAN1=		bluegps.1
+PLIST_FILES=	bin/bluegps
+
+post-patch:
+	@${REINPLACE_CMD} -e '/^CC=/d' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/comms/bluegps/pkg-descr b/comms/bluegps/pkg-descr
index c597c40b119c..de87cc4d5011 100644
--- a/comms/bluegps/pkg-descr
+++ b/comms/bluegps/pkg-descr
@@ -2,5 +2,4 @@ BlueGPS is a simple (freebsd native) command line tool to download
 datalogs from the Royaltek RBT-3000 bluetooth GPS receiver over a
 bluetooth link.
 
-Author: Till Harbaum <Till@Harbaum.org>
 WWW: http://www.harbaum.org/till/bluegps/
diff --git a/comms/bluegps/pkg-plist b/comms/bluegps/pkg-plist
deleted file mode 100644
index 15d8eaf9f9d4..000000000000
--- a/comms/bluegps/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/bluegps