diff --git a/security/otpcalc/Makefile b/security/otpcalc/Makefile
new file mode 100644
index 00000000000..4b2aa81e709
--- /dev/null
+++ b/security/otpcalc/Makefile
@@ -0,0 +1,29 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2005/09/04 20:07:37 aanriot Exp $
+
+COMMENT=	"OTP and S/Key calculator for X"
+
+DISTNAME=	otpCalc-0.97
+CATEGORIES=    	security
+
+HOMEPAGE=	http://original.killa.net/infosec/otpCalc/
+
+# GPL
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes 
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c crypto m X11 Xext Xi glib gmodule
+
+MASTER_SITES=	${HOMEPAGE}
+
+CONFIGURE_STYLE=gnu dest
+
+MODULES=	devel/gettext
+
+USE_GMAKE=	Yes
+ALL_TARGET=	otpCalc otpCalc.1
+LIB_DEPENDS=	gtk.2,gdk.2::x11/gtk+
+
+NO_REGRESS=	Yes
+
+.include <bsd.port.mk>
diff --git a/security/otpcalc/distinfo b/security/otpcalc/distinfo
new file mode 100644
index 00000000000..29dcd603415
--- /dev/null
+++ b/security/otpcalc/distinfo
@@ -0,0 +1,4 @@
+MD5 (otpCalc-0.97.tar.gz) = 73c9a9e95462afda725fdf17a301f0b0
+RMD160 (otpCalc-0.97.tar.gz) = 0b7908f90fede73e23f25cb0ebd0f9e87393a2a2
+SHA1 (otpCalc-0.97.tar.gz) = 0ca443baf05ed491e49419345ec815256a822b8c
+SIZE (otpCalc-0.97.tar.gz) = 123704
diff --git a/security/otpcalc/patches/patch-Makefile_in b/security/otpcalc/patches/patch-Makefile_in
new file mode 100644
index 00000000000..7f27c34a674
--- /dev/null
+++ b/security/otpcalc/patches/patch-Makefile_in
@@ -0,0 +1,25 @@
+$OpenBSD: patch-Makefile_in,v 1.1.1.1 2005/09/04 20:07:37 aanriot Exp $
+--- Makefile.in.orig	Sun Aug  7 18:44:33 2005
++++ Makefile.in	Sun Aug  7 18:46:01 2005
+@@ -3,8 +3,8 @@ VER = 0.97
+ 
+ CC = @CC@
+ DEFS = -DVERSION=\"$(VER)\" @DEFS@
+-CFLAGS = -s -O3 -Wall -pipe `gtk-config --cflags`
+-LIBS = `gtk-config --libs` @LIBS@
++CFLAGS += `gtk-config --cflags`
++LIBS += `gtk-config --libs` @LIBS@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -29,8 +29,8 @@ distclean: clean
+ 	rm -f Makefile config.h config.status config.cache config.log 
+ 
+ install: otpCalc otpCalc.1
+-	install -m 755 -o root -g root otpCalc $(bindir)/$(NAME)
+-	install -m 644 -o root -g root otpCalc.1 $(mandir)/man1/$(NAME).1
++	${BSD_INSTALL_PROGRAM} otpCalc $(bindir)/$(NAME)
++	${BSD_INSTALL_MAN} otpCalc.1 $(mandir)/man1/$(NAME).1
+ 
+ dist: distclean
+ 	( cd ..; \
diff --git a/security/otpcalc/pkg/DESCR b/security/otpcalc/pkg/DESCR
new file mode 100644
index 00000000000..9e4249167ee
--- /dev/null
+++ b/security/otpcalc/pkg/DESCR
@@ -0,0 +1,2 @@
+otpCalc is an RFC2289 and RFC1760 compliant one time password
+calculator, written to use the GTK+ library for screen I/O.
diff --git a/security/otpcalc/pkg/PLIST b/security/otpcalc/pkg/PLIST
new file mode 100644
index 00000000000..bde7e8cd727
--- /dev/null
+++ b/security/otpcalc/pkg/PLIST
@@ -0,0 +1,3 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2005/09/04 20:07:37 aanriot Exp $
+bin/otpCalc
+@man man/man1/otpCalc.1