diff --git a/net/poptop/Makefile b/net/poptop/Makefile
new file mode 100644
index 00000000000..89ef5c8deae
--- /dev/null
+++ b/net/poptop/Makefile
@@ -0,0 +1,31 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2003/04/17 08:59:26 wilfried Exp $
+
+COMMENT=		"PPTP Server"
+
+VERSION=		1.1.4
+PKGNAME=		poptop-${VERSION}.b3
+DISTNAME=		pptpd-${VERSION}-b3
+CATEGORIES=		net
+
+HOMEPAGE=		http://www.poptop.org/
+
+MAINTAINER=		Craig Barraclough <craigba@creative.com.au>
+
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=poptop/}
+
+CONFIGURE_STYLE=	gnu
+CONFIGURE_ARGS+=	--with-bsdppp --with-pppd-ip-alloc
+
+WRKDIST=		${WRKDIR}/poptop-${VERSION}
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/poptop
+	${INSTALL_DATA} ${WRKSRC}/samples/pptpd.conf ${PREFIX}/share/examples/poptop/pptpd.conf-sample
+
+.include <bsd.port.mk>
diff --git a/net/poptop/distinfo b/net/poptop/distinfo
new file mode 100644
index 00000000000..39f87452363
--- /dev/null
+++ b/net/poptop/distinfo
@@ -0,0 +1,3 @@
+MD5 (pptpd-1.1.4-b3.tar.gz) = 4dd39d55beef23d4d3948a7df844bbbe
+RMD160 (pptpd-1.1.4-b3.tar.gz) = 9483fa21e930bb5cbd32f69023476f75b27399b8
+SHA1 (pptpd-1.1.4-b3.tar.gz) = 8090fb1dbacb23fdfee457a4e43e70e74df449a6
diff --git a/net/poptop/patches/patch-pptpctrl_c b/net/poptop/patches/patch-pptpctrl_c
new file mode 100644
index 00000000000..af545ba7144
--- /dev/null
+++ b/net/poptop/patches/patch-pptpctrl_c
@@ -0,0 +1,11 @@
+$OpenBSD: patch-pptpctrl_c,v 1.1.1.1 2003/04/17 08:59:26 wilfried Exp $
+--- pptpctrl.c.orig	Fri Apr 11 10:51:32 2003
++++ pptpctrl.c	Fri Apr 11 10:51:53 2003
+@@ -26,7 +26,6 @@
+ #include <time.h>
+ #include <sys/time.h>
+ #include <dirent.h>
+-#include <net/if.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
diff --git a/net/poptop/pkg/DEINSTALL b/net/poptop/pkg/DEINSTALL
new file mode 100644
index 00000000000..5a14c50bc1e
--- /dev/null
+++ b/net/poptop/pkg/DEINSTALL
@@ -0,0 +1,21 @@
+#!/bin/sh
+# $OpenBSD: DEINSTALL,v 1.1.1.1 2003/04/17 08:59:26 wilfried Exp $
+
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_DIR=${SYSCONFDIR}
+
+echo
+echo "+---------------"
+echo "| To completely deinstall the $1 package you need to perform"
+echo "| this step as root:"
+echo "|"
+echo "|           rm -f $CONFIG_DIR/pptpd.conf"
+echo "|"
+echo "| Do not do this if you plan on re-installing $1"
+echo "| at some future time."
+echo "+---------------"
+echo
+
+exit 0
diff --git a/net/poptop/pkg/DESCR b/net/poptop/pkg/DESCR
new file mode 100644
index 00000000000..566230248d4
--- /dev/null
+++ b/net/poptop/pkg/DESCR
@@ -0,0 +1,6 @@
+PoPTop is a PPTP server solution for Unix. PoPToP allows Unix Servers
+to function seamlessly in the PPTP VPN environment.  The current
+release version supports Windows(tm) 95/98/NT/2000 PPTP clients and
+Unix PPTP clients.
+
+WWW: ${HOMEPAGE}
diff --git a/net/poptop/pkg/INSTALL b/net/poptop/pkg/INSTALL
new file mode 100644
index 00000000000..fa6c7633316
--- /dev/null
+++ b/net/poptop/pkg/INSTALL
@@ -0,0 +1,65 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1.1.1 2003/04/17 08:59:26 wilfried Exp $
+
+
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=${SYSCONFDIR}/pptpd.conf
+SAMPLE_CONFIG_FILE=$PREFIX/share/examples/poptop/pptpd.conf-sample
+
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| The existing $1 configuration file, $CONFIG_FILE,"
+    echo "| has NOT been changed.  You may want to compare it to the"
+    echo "| current sample file, $SAMPLE_CONFIG_FILE,"
+    echo "| and update your configuration as needed."
+    echo "+---------------"
+    echo
+}
+
+do_install()
+{
+    install -o root -g wheel -m 644 $SAMPLE_CONFIG_FILE $CONFIG_FILE
+    echo
+    echo "+---------------"
+    echo "| The $1 configuration file, $CONFIG_FILE,"
+    echo "| has been installed.  Please view this file and change"
+    echo "| the configuration to meet your needs."
+    echo "+---------------"
+    echo
+
+}
+
+# verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    PRE-INSTALL)
+	: nothing to pre-install for this port
+	;;
+    POST-INSTALL)
+	if [ -f $CONFIG_FILE ]; then
+	    do_notice $1
+	else
+	    do_install $1
+	fi
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/net/poptop/pkg/PLIST b/net/poptop/pkg/PLIST
new file mode 100644
index 00000000000..53ff9dd9f6b
--- /dev/null
+++ b/net/poptop/pkg/PLIST
@@ -0,0 +1,8 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2003/04/17 08:59:26 wilfried Exp $
+man/man5/pptpd.conf.5
+man/man8/pptpctrl.8
+man/man8/pptpd.8
+sbin/pptpctrl
+sbin/pptpd
+share/examples/poptop/pptpd.conf-sample
+@dirrm share/examples/poptop