diff --git a/comms/Makefile b/comms/Makefile
index 8f73c72825cf..7a0472f4e0f6 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -50,6 +50,7 @@
     SUBDIR += linpsk
     SUBDIR += linrad
     SUBDIR += lirc
+    SUBDIR += locator
     SUBDIR += lrzsz
     SUBDIR += ltmdm
     SUBDIR += mgetty+sendfax
diff --git a/comms/locator/Makefile b/comms/locator/Makefile
new file mode 100644
index 000000000000..ee85c118a906
--- /dev/null
+++ b/comms/locator/Makefile
@@ -0,0 +1,29 @@
+# ports collection makefile for:	locator
+# Date created:		30 June 2005
+# Whom:			db
+#
+# $FreeBSD$
+#
+
+PORTNAME=	locator
+PORTVERSION=	0.1
+CATEGORIES=	comms astro
+MASTER_SITES=	${MASTER_SITE_SUNSITE:=apps/ham/}
+
+MAINTAINER=	db@db.net
+COMMENT=	Grid square calculator program used in Amateur Radio and GPS work
+
+PORTDOCS=	README
+PLIST_FILES=	bin/locator
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/locator ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	@${ECHO} ""
+	@${ECHO} "locator README installed in ${DOCSDIR}"
+	@${ECHO} ""
+.endif
+
+.include <bsd.port.mk>
diff --git a/comms/locator/distinfo b/comms/locator/distinfo
new file mode 100644
index 000000000000..f6d06abe1b92
--- /dev/null
+++ b/comms/locator/distinfo
@@ -0,0 +1,2 @@
+MD5 (locator-0.1.tar.gz) = 788353dbff268a41113074e8bb613fb8
+SIZE (locator-0.1.tar.gz) = 2555
diff --git a/comms/locator/files/patch-conv_fn.cc b/comms/locator/files/patch-conv_fn.cc
new file mode 100644
index 000000000000..ab5476e22869
--- /dev/null
+++ b/comms/locator/files/patch-conv_fn.cc
@@ -0,0 +1,10 @@
+--- conv_fn.cc.orig	Thu Jun 30 15:10:32 2005
++++ conv_fn.cc	Thu Jun 30 15:11:11 2005
+@@ -5,6 +5,7 @@
+
+ #include <ctype.h>
+ #include <math.h>
++#include <string.h>
+
+ int GPStoLOCATOR(float gps_long, float gps_lat, char *locator) {
+   /* gps_long and gps_lat are the longitutes (-180 to +180) and   */
diff --git a/comms/locator/files/patch-locator.cc b/comms/locator/files/patch-locator.cc
new file mode 100644
index 000000000000..28ea4c749e9c
--- /dev/null
+++ b/comms/locator/files/patch-locator.cc
@@ -0,0 +1,19 @@
+--- locator.cc.orig	Thu Jun 30 15:21:49 2005
++++ locator.cc	Thu Jun 30 17:04:24 2005
+@@ -3,9 +3,13 @@
+ /* Last change 29.07.2001  */
+
+ /* A few includes */
+-#include <iostream.h>
+-#include <string.h>
+-#include <stdio.h>
++#include <iostream>
++#include <cstdio>
++#include <cstring>
++
++using std::iostream;
++using std::ostream;
++using std::cout;
+
+ /* A few definitions */
+ #define VERSION "0.1"
diff --git a/comms/locator/pkg-descr b/comms/locator/pkg-descr
new file mode 100644
index 000000000000..b21e03d97682
--- /dev/null
+++ b/comms/locator/pkg-descr
@@ -0,0 +1,10 @@
+This is a program for translating mainhead grid squares to and from lat/long.
+This is of most use to Amateur Radio operators but may be useful to GPS users.
+
+Originally written by:
+Harald M. Stauss
+harald.stauss@web.de
+DO1JHS @ DB0GR.#BLN.DEU.EU
+
+- Diane Bruce, VA3DB
+db@db.net