diff --git a/sysutils/login_oath/Makefile b/sysutils/login_oath/Makefile
new file mode 100644
index 00000000000..1ed0adc735b
--- /dev/null
+++ b/sysutils/login_oath/Makefile
@@ -0,0 +1,28 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2011/03/16 10:11:37 sthen Exp $
+
+COMMENT=	authentication provider for OATH one-time passwords
+
+DISTNAME=	login_oath-0.6
+CATEGORIES=    	sysutils	
+
+MASTER_SITES=	http://spacehopper.org/mirrors/
+
+MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
+
+# BSD
+PERMIT_PACKAGE_CDROM=	Yes 
+PERMIT_PACKAGE_FTP=	Yes 
+PERMIT_DISTFILES_CDROM= Yes 
+PERMIT_DISTFILES_FTP=	Yes 
+
+WANTLIB=	c oath util
+
+NO_REGRESS=	Yes
+
+LIB_DEPENDS=	security/oath-toolkit
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/README \
+	    ${PREFIX}/share/doc/pkg-readmes/${FULLPKGNAME}
+
+.include <bsd.port.mk>
diff --git a/sysutils/login_oath/distinfo b/sysutils/login_oath/distinfo
new file mode 100644
index 00000000000..f14278fba09
--- /dev/null
+++ b/sysutils/login_oath/distinfo
@@ -0,0 +1,5 @@
+MD5 (login_oath-0.6.tar.gz) = H0RpiNNdu6lUsmmF4Q+Vgw==
+RMD160 (login_oath-0.6.tar.gz) = yk7FmfZtzQpfl2FpJFeSaqx8fp4=
+SHA1 (login_oath-0.6.tar.gz) = TeB183aUlUEatgry7VHOxHEYfFk=
+SHA256 (login_oath-0.6.tar.gz) = WlyUFC6uno59VLzc1i7V3/F1ALYJEWZWtiJU8rUZAlY=
+SIZE (login_oath-0.6.tar.gz) = 18427
diff --git a/sysutils/login_oath/pkg/DESCR b/sysutils/login_oath/pkg/DESCR
new file mode 100644
index 00000000000..e4332e519d1
--- /dev/null
+++ b/sysutils/login_oath/pkg/DESCR
@@ -0,0 +1,4 @@
+The login_oath package contains bsdauth providers to validate OATH one-
+time passwords via oath-toolkit (liboath). Currently only TOTP (time-based)
+passwords are supported. Two separate modules allow for either OTP-only
+or a combination of OTP+password.
diff --git a/sysutils/login_oath/pkg/PLIST b/sysutils/login_oath/pkg/PLIST
new file mode 100644
index 00000000000..f03c37a2314
--- /dev/null
+++ b/sysutils/login_oath/pkg/PLIST
@@ -0,0 +1,19 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2011/03/16 10:11:37 sthen Exp $
+@group auth
+libexec/auth/
+@bin libexec/auth/login_totp
+@mode 4555
+@owner root
+@sample /usr/libexec/auth/login_-totp
+@mode
+@owner
+@bin libexec/auth/login_totp-and-pwd
+@mode 4555
+@owner root
+@sample /usr/libexec/auth/login_-totp-and-pwd
+@mode
+@owner
+@group
+@man man/cat8/login_totp-and-pwd.0
+@man man/cat8/login_totp.0
+share/doc/pkg-readmes/${FULLPKGNAME}