diff --git a/comms/Makefile b/comms/Makefile
index 450bdc3b74dc..2c648852fa26 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -47,6 +47,7 @@
     SUBDIR += kpsk
     SUBDIR += libirman
     SUBDIR += libticables
+    SUBDIR += linpsk
     SUBDIR += linrad
     SUBDIR += lirc
     SUBDIR += lrzsz
diff --git a/comms/linpsk/Makefile b/comms/linpsk/Makefile
new file mode 100644
index 000000000000..2fccdbcf326f
--- /dev/null
+++ b/comms/linpsk/Makefile
@@ -0,0 +1,58 @@
+# New ports collection makefile for:	linpsk
+# Date created:				29 May 2005
+# Whom:					Søren Straarup <xride@x12.dk>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	linpsk
+PORTVERSION=	0.8.1
+CATEGORIES=	comms
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	xride@x12.dk
+COMMENT=	A qt psk31 client
+
+LIB_DEPENDS=	fftw3:${PORTSDIR}/math/fftw3 \
+		portaudio:${PORTSDIR}/audio/portaudio
+
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+USE_QT_VER=	3
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+
+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS=	--with-qtdir=${X11BASE}
+
+SUB_FILES=	pkg-message
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+IGNORE=		does not build on FreeBSD 4.x
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lpthread||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-I$$(top_srcdir)/src/portaudio||' \
+		${WRKSRC}/src/Makefile.in \
+		${WRKSRC}/src/interfaces/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|$$(top_builddir)/src/portaudio/libportaudio\.a|-lportaudio|; \
+		 /^SUBDIRS =/ s|portaudio||' \
+		${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		's|-O2|${CXXFLAGS}|; \
+		 /^install-exec-am/ s|install-libLIBRARIES||' \
+		${WRKSRC}/src/interfaces/Makefile.in
+
+post-install:
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${FILESDIR}/LinPSKConfig.xml ${EXAMPLESDIR}
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.post.mk>
diff --git a/comms/linpsk/distinfo b/comms/linpsk/distinfo
new file mode 100644
index 000000000000..8e476a404538
--- /dev/null
+++ b/comms/linpsk/distinfo
@@ -0,0 +1,2 @@
+MD5 (linpsk-0.8.1.tar.gz) = 52239d755a68b9af94b254d23251d39e
+SIZE (linpsk-0.8.1.tar.gz) = 435463
diff --git a/comms/linpsk/files/LinPSKConfig.xml b/comms/linpsk/files/LinPSKConfig.xml
new file mode 100644
index 000000000000..142bf1b1c1f8
--- /dev/null
+++ b/comms/linpsk/files/LinPSKConfig.xml
@@ -0,0 +1,28 @@
+<!DOCTYPE LinpskConfiguration>
+<Parameters>
+ <WindowsParameter>
+  <MinimumWindowWidth Value="640" />
+  <WindowWidth Value="640" />
+  <MinimumWindowHeight Value="540" />
+  <Xpos Value="108" />
+  <Ypos Value="45" />
+  <WindowHeight Value="589" />
+  <StatusBarHeight Value="20" />
+  <Font Size="10" Name="Helvetica" />
+ </WindowsParameter>
+ <Colors>
+  <Color g="0" r="0" b="0" />
+ </Colors>
+ <Mode DemoTypeNumber="0" DemoMode="false" />
+ <Operating>
+  <Callsign></Callsign>
+  <PTT Device="None" />
+  <QsoFile FileName="QSOData.adif" />
+  <Timeoffset Value="-2" />
+  <Slashed0 Value="false" />
+  <InputDevice Value="/dev/dsp" />
+  <OutputDevice Value="/dev/dsp" />
+  <InputVolume Value="50" />
+  <OutputVolume Value="50" />
+ </Operating>
+</Parameters>
diff --git a/comms/linpsk/files/pkg-message.in b/comms/linpsk/files/pkg-message.in
new file mode 100644
index 000000000000..5feba4cfc8a2
--- /dev/null
+++ b/comms/linpsk/files/pkg-message.in
@@ -0,0 +1,4 @@
+===============================================================================
+ You should now copy the default configuration file to your home directory:
+     cp %%EXAMPLESDIR%%/LinPSKConfig.xml ~
+===============================================================================
diff --git a/comms/linpsk/pkg-descr b/comms/linpsk/pkg-descr
new file mode 100644
index 000000000000..1fd435216143
--- /dev/null
+++ b/comms/linpsk/pkg-descr
@@ -0,0 +1,3 @@
+This is a small PSK31 program that uses QT, and a soundcard as modem.
+
+WWW: http://linpsk.sourceforge.net/
diff --git a/comms/linpsk/pkg-plist b/comms/linpsk/pkg-plist
new file mode 100644
index 000000000000..58184724a46a
--- /dev/null
+++ b/comms/linpsk/pkg-plist
@@ -0,0 +1,3 @@
+bin/linpsk
+%%EXAMPLESDIR%%/LinPSKConfig.xml
+@dirrm %%EXAMPLESDIR%%