diff --git a/comms/smstools/Makefile b/comms/smstools/Makefile
new file mode 100644
index 00000000000..c315fc93b2d
--- /dev/null
+++ b/comms/smstools/Makefile
@@ -0,0 +1,46 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2007/07/18 11:03:34 jasper Exp $
+
+COMMENT=		gateway to send and receive SMS through GSM mobile phones
+
+V=			3.0.9
+DISTNAME=		smstools3-${V}
+PKGNAME=		smstools-${V}
+
+CATEGORIES=		comms
+
+HOMEPAGE=		http://smstools3.kekekasvi.com/
+
+MAINTAINER=		Stuart Henderson <stu@spacehopper.org>
+
+#GPLv2
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM= Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+WANTLIB=		c
+
+MASTER_SITES=		${HOMEPAGE}/packages/
+
+USE_GMAKE=		Yes
+NO_REGRESS=		Yes
+WRKDIST=		${WRKDIR}/smstools3
+WRKSRC= 		${WRKDIST}/src
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/smsd ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKDIST}/scripts/{sendsms,sms2html} \
+		${WRKDIST}/scripts/{sms2unicode,unicode2sms} \
+		${PREFIX}/bin
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/smstools
+	${INSTALL_DATA} ${WRKDIST}/examples/smsd.conf.full \
+		${PREFIX}/share/examples/smstools
+	${INSTALL_DATA} ${FILESDIR}/smsd.conf.openbsd \
+	       ${PREFIX}/share/examples/smstools
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smstools
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/smstools/slideshow
+	${INSTALL_DATA} ${WRKDIST}/doc/*html ${PREFIX}/share/doc/smstools
+	${INSTALL_DATA} ${WRKDIST}/doc/slideshow/* \
+		${PREFIX}/share/doc/smstools/slideshow
+
+.include <bsd.port.mk>
diff --git a/comms/smstools/distinfo b/comms/smstools/distinfo
new file mode 100644
index 00000000000..f3e6797c0b7
--- /dev/null
+++ b/comms/smstools/distinfo
@@ -0,0 +1,5 @@
+MD5 (smstools3-3.0.9.tar.gz) = EuzU+qP6/7VNv5zcm+BCPA==
+RMD160 (smstools3-3.0.9.tar.gz) = We6gAp41+GKBRiSxDkgqZ3jE2AY=
+SHA1 (smstools3-3.0.9.tar.gz) = j5UoFX9Cq+t3IDmmJTrGhlAmVA8=
+SHA256 (smstools3-3.0.9.tar.gz) = Nw+XyzWl6fIK6yA4lKQD2dlid2KSvizouVeKaOs9/h0=
+SIZE (smstools3-3.0.9.tar.gz) = 210582
diff --git a/comms/smstools/files/smsd.conf.openbsd b/comms/smstools/files/smsd.conf.openbsd
new file mode 100644
index 00000000000..b2afe8faa0e
--- /dev/null
+++ b/comms/smstools/files/smsd.conf.openbsd
@@ -0,0 +1,32 @@
+# $OpenBSD: smsd.conf.openbsd,v 1.1.1.1 2007/07/18 11:03:34 jasper Exp $
+
+devices = GSM1
+#devices = GSM1, GSM2
+loglevel = 7
+
+# setuid() to this user:
+user = _smsd
+# it's possible to setgid too, but default is the set of
+# groups from /etc/groups
+
+pidfile = /var/run/smsd/smsd.pid
+infofile = /var/run/smsd/smsd.info
+
+#logfile = syslog
+logfile = /var/log/smsd/smsd.log
+
+[GSM1]
+# A sample USB device with typical broken rtscts, so use
+# a send delay to reduce the risk of overruns. Some PC cards
+# also break rts/cts. For this one I have set incoming=no
+# so it doesn't pull the existing messages off the phone.
+device = /dev/cuaU0
+incoming = no
+rtscts = no
+send_delay = 20
+
+[GSM2]
+device = /dev/cua00
+incoming = yes
+#pin = 1111
+# pin is normally used only with data cards, not phones
diff --git a/comms/smstools/pkg/DESCR b/comms/smstools/pkg/DESCR
new file mode 100644
index 00000000000..fb97a569599
--- /dev/null
+++ b/comms/smstools/pkg/DESCR
@@ -0,0 +1,22 @@
+The SMS Server Tools 3 is a SMS Gateway software which can send and
+receive short messages through GSM modems and mobile phones.
+
+You can send short messages by simply storing text files into a
+special spool directory. The program monitors this directory and
+sends new files automatically. It also stores received short messages
+into another directory as text files. Binary messages (including
+Unicode text) are also supported, for example ring tone messages.
+It's also possible to send a WAP Push message to the WAP / MMS
+capable mobile phone.
+
+The program can run other external programs or scripts after events
+like reception of a new message, successful sending and also when
+the program detects a problem. These programs can inspect the related
+text files and perform automatic actions, for example storing
+information into a database, sending an automatic reply, forwarding
+messages via eMail (SMS to eMail gateway), ... and whatever you like.
+
+This software needs a GSM modem (or mobile phone) with SMS command
+set according to the european specifications GSM 07.05 (=ETSI TS
+300 585) and GSM 03.38 (=ETSI TS 100 900). AT command set is
+supported.
diff --git a/comms/smstools/pkg/MESSAGE b/comms/smstools/pkg/MESSAGE
new file mode 100644
index 00000000000..3ebb214e2d2
--- /dev/null
+++ b/comms/smstools/pkg/MESSAGE
@@ -0,0 +1,10 @@
+To have smsd start at boot time, you have to adapt
+${SYSCONFDIR}/smsd.conf and insert the following into /etc/rc.local.
+
+if [ -x ${PREFIX}/bin/smsd ]; then
+	install -d -o _smsd /var/run/smsd
+	echo -n ' smsd';	${PREFIX}/bin/smsd
+fi
+
+smsd needs access to the serial port; this can be done by adding
+the _smsd user to 'dialer' in ${SYSCONFDIR}/group.
diff --git a/comms/smstools/pkg/PLIST b/comms/smstools/pkg/PLIST
new file mode 100644
index 00000000000..bdf2f55b200
--- /dev/null
+++ b/comms/smstools/pkg/PLIST
@@ -0,0 +1,68 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2007/07/18 11:03:34 jasper Exp $
+@newgroup _smsd:590
+@newuser _smsd:590:_smsd:daemon:smsd user:/nonexistent:/sbin/nologin
+bin/sendsms
+bin/sms2html
+bin/sms2unicode
+bin/smsd
+bin/unicode2sms
+share/doc/smstools/
+share/doc/smstools/alarmhandler.html
+share/doc/smstools/blacklist.html
+share/doc/smstools/book.html
+share/doc/smstools/buch.html
+share/doc/smstools/compiling.html
+share/doc/smstools/configure.html
+share/doc/smstools/configure2.html
+share/doc/smstools/costs.html
+share/doc/smstools/eventhandler.html
+share/doc/smstools/faq.html
+share/doc/smstools/fileformat.html
+share/doc/smstools/gpl.html
+share/doc/smstools/gpl_de.html
+share/doc/smstools/hardwarecomp.html
+share/doc/smstools/history3.html
+share/doc/smstools/index.html
+share/doc/smstools/license.html
+share/doc/smstools/links.html
+share/doc/smstools/references.html
+share/doc/smstools/run.html
+share/doc/smstools/slideshow/
+share/doc/smstools/slideshow/blacklist.gif
+share/doc/smstools/slideshow/eventhandler.gif
+share/doc/smstools/slideshow/logfile.gif
+share/doc/smstools/slideshow/modem.gif
+share/doc/smstools/slideshow/move_l.gif
+share/doc/smstools/slideshow/move_r.gif
+share/doc/smstools/slideshow/page1.html
+share/doc/smstools/slideshow/page2.gif
+share/doc/smstools/slideshow/page2.html
+share/doc/smstools/slideshow/page2b.html
+share/doc/smstools/slideshow/page3.html
+share/doc/smstools/slideshow/page4.html
+share/doc/smstools/slideshow/page5.html
+share/doc/smstools/slideshow/page6.html
+share/doc/smstools/slideshow/page7.html
+share/doc/smstools/slideshow/page8.html
+share/doc/smstools/slideshow/queue.gif
+share/doc/smstools/slideshow/sms.gif
+share/doc/smstools/slideshow/statistic.gif
+share/doc/smstools/slideshow/status.gif
+share/doc/smstools/softwarecomp.html
+share/doc/smstools/statformat.html
+share/doc/smstools/statusmonitor.html
+share/doc/smstools/support.html
+share/doc/smstools/udh.html
+share/doc/smstools/windows.html
+share/examples/smstools/
+share/examples/smstools/smsd.conf.full
+share/examples/smstools/smsd.conf.openbsd
+@sample ${SYSCONFDIR}/smsd.conf
+@sample /var/spool/sms/
+@mode 770
+@owner _smsd
+@group _smsd
+@sample /var/log/smsd/
+@sample /var/spool/sms/incoming/
+@sample /var/spool/sms/checked/
+@sample /var/spool/sms/outgoing/