diff --git a/security/Makefile b/security/Makefile
index 054fb622fbdf..e4e94c1b61fb 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -20,6 +20,7 @@
     SUBDIR += cops
     SUBDIR += crack
     SUBDIR += cracklib
+    SUBDIR += cryptopp
     SUBDIR += cyrus-sasl
     SUBDIR += ddos_scan
     SUBDIR += donkey
diff --git a/security/cryptopp/Makefile b/security/cryptopp/Makefile
new file mode 100644
index 000000000000..40f162aff3c2
--- /dev/null
+++ b/security/cryptopp/Makefile
@@ -0,0 +1,54 @@
+# New ports collection makefile for:   cryptopp
+# Date created:        18 January 2001
+# Whom:                George Reid <greid@ukug.uk.freebsd.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=		cryptopp
+PORTVERSION=		4.1
+CATEGORIES=		security
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE} \
+			http://www.eskimo.com/~weidai/
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=		crypto${PORTVERSION:S/.//g}
+
+MAINTAINER=		greid@ukug.uk.freebsd.org
+
+NO_WRKSUBDIR=		yes
+USE_ZIP=		yes
+EXTRACT_BEFORE_ARGS=	-aq
+USE_GMAKE=		yes
+MAKEFILE=		GNUmakefile
+
+HEADERFILES=		3way.h adler32.h aes.h algebra.h arc4.h asn.h base64.h \
+			bench.h blowfish.h blumgold.h blumshub.h cast.h cbc.h \
+			cbcmac.h channels.h config.h crc.h cryptlib.h des.h \
+			default.h dh.h dh2.h diamond.h dmac.h dsa.h ec2n.h \
+			eccrypto.h ecp.h elgamal.h eprecomp.h files.h gf256.h \
+			filters.h gf2_32.h gf2n.h gost.h gzip.h haval.h hex.h \
+			hmac.h hrtimer.h ida.h idea.h integer.h iterhash.h \
+			lubyrack.h luc.h mars.h md2.h md5.h md5mac.h mdc.h \
+			misc.h modarith.h modes.h modexppc.h mqueue.h mqv.h \
+			nbtheory.h network.h nr.h oaep.h oids.h osrng.h \
+			panama.h pch.h pkcspad.h polynomi.h pssr.h pubkey.h \
+			queue.h rabin.h randpool.h rc2.h rc5.h rc6.h \
+			rijndael.h ripemd.h rng.h rsa.h rw.h safer.h \
+			sapphire.h seal.h secshare.h serpent.h sha.h shark.h \
+			skipjack.h smartptr.h socketft.h square.h tea.h \
+			tiger.h twofish.h validate.h wake.h winpipes.h words.h \
+			xormac.h xtr.h xtrcrypt.h zdeflate.h zinflate.h zlib.h
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/cryptest ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/libcryptopp.a ${PREFIX}/lib
+	${MKDIR} ${PREFIX}/include/cryptopp
+.for H in ${HEADERFILES}
+	${INSTALL_DATA} ${WRKSRC}/$H ${PREFIX}/include/cryptopp
+.endfor
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/cryptopp
+	${CP} ${WRKSRC}/README.txt ${PREFIX}/share/doc/cryptopp/README
+.endif
+
+.include <bsd.port.mk>
diff --git a/security/cryptopp/distinfo b/security/cryptopp/distinfo
new file mode 100644
index 000000000000..c066f46a5d44
--- /dev/null
+++ b/security/cryptopp/distinfo
@@ -0,0 +1 @@
+MD5 (crypto41.zip) = aaaa77cf49a8517d815862219feb4dcd
diff --git a/security/cryptopp/files/patch-aa b/security/cryptopp/files/patch-aa
new file mode 100644
index 000000000000..72895cd799b4
--- /dev/null
+++ b/security/cryptopp/files/patch-aa
@@ -0,0 +1,37 @@
+--- GNUmakefile.orig	Thu Jan 18 11:46:13 2001
++++ GNUmakefile	Thu Jan 18 12:36:40 2001
+@@ -1,4 +1,4 @@
+-CXXFLAGS = -O2 -w
++CXXFLAGS += -w
+ ARFLAGS = cr
+ RANLIB = ranlib
+ UNAME = $(shell uname)
+@@ -6,7 +6,7 @@
+ ifeq ($(UNAME),)	# for DJGPP, where uname doesn't exist
+ CXXFLAGS := $(CXXFLAGS) -mbnu210
+ else
+-CXXFLAGS := $(CXXFLAGS) -pipe
++CXXFLAGS := $(CXXFLAGS)
+ endif
+ 
+ ifeq ($(UNAME),SunOS)
+@@ -28,16 +28,16 @@
+ TESTOBJS = bench.o test.o validat1.o validat2.o validat3.o
+ LIBOBJS = $(filter-out $(TESTOBJS),$(OBJS))
+ 
+-all: cryptest.exe
++all: cryptest
+ 
+ clean:
+-	$(RM) cryptest.exe libcryptopp.a $(LIBOBJS) $(TESTOBJS)
++	$(RM) cryptest libcryptopp.a $(LIBOBJS) $(TESTOBJS)
+ 
+ libcryptopp.a: $(LIBOBJS)
+ 	$(AR) $(ARFLAGS) $@ $(LIBOBJS)
+ 	$(RANLIB) $@
+ 
+-cryptest.exe: libcryptopp.a $(TESTOBJS)
++cryptest: libcryptopp.a $(TESTOBJS)
+ 	$(CXX) -o $@ $(CXXFLAGS) $(TESTOBJS) -L. -lcryptopp $(LDFLAGS) $(LDLIBS)
+ 
+ .SUFFIXES: .cpp
diff --git a/security/cryptopp/pkg-comment b/security/cryptopp/pkg-comment
new file mode 100644
index 000000000000..30a6d34561ed
--- /dev/null
+++ b/security/cryptopp/pkg-comment
@@ -0,0 +1 @@
+A free C++ class library of cryptographic schemes
diff --git a/security/cryptopp/pkg-descr b/security/cryptopp/pkg-descr
new file mode 100644
index 000000000000..175b19b36928
--- /dev/null
+++ b/security/cryptopp/pkg-descr
@@ -0,0 +1,26 @@
+Crypto++ is a free C++ class library of cryptographic schemes. Includes:
+
+* A class hierarchy with an API defined by abstract base classes
+* Proposed AES (and RC6, MARS, Twofish, Serpent, CAST-256)
+* Symmetric block cipers: IDEA, DES/Triple DES,DESX, RC2, RC5, Blowfish,
+  Diamond2, TEA, SAFER, 3-WAY, GOST, SHARK, CAST-128, Square, Skipjack
+* Generic cipher modes: CBC padded/ciphertext stealing (CTS), CFB, OFB
+* Stream cipher: Panama, ARC4, SEAL, WAKE, Sapphire, BlumBlumShub
+* Public key: RSA, DSA, ElGamal, NR, BlumGoldwasser, Rabin/RW, LUC, LUCELG
+* Padding schemes for PK systems: PKCS#1 v2, OAEP, PSSR, IEEE P1363 EMSA2
+* Key agreement schemes: DH, DH2, MQV, LUCDIF, XTR-DH
+* Elliptic curve cryptography: ECDSA, ENR, EIES, ECDHD, ECMQVC
+* One-way hash functions: SHA-1/2, MD2/5, HAVAL, RIPEMD-160, Tiger, Panama
+* Message authentication codes: MD5-MAC, HMAC, XOR-MAC, CBC-MAC, DMAC
+* Cipher constructions from hash functions: Luby-Rackoff, MD
+* Pseudorandom number generators: ANSI X9.17 appendix C, PGP's RandPool
+* Shamir's secret sharing scheme/Rabin's information dispersal algorithm (IDA)
+* gzip, DEFLATE and zlib format support
+* Fast multiprecision integer (bignum) and polynomial operations
+* Prime number generation/verification, base-64 and 32-bit CRC encoding
+* A high level interface for most of the above
+
+WWW: http://www.eskimo.com/~weidai/cryptlib.html
+
+- George Reid
+greid@ukug.uk.freebsd.org
diff --git a/security/cryptopp/pkg-plist b/security/cryptopp/pkg-plist
new file mode 100644
index 000000000000..35a6fe2adc02
--- /dev/null
+++ b/security/cryptopp/pkg-plist
@@ -0,0 +1,110 @@
+bin/cryptest
+lib/libcryptopp.a
+include/cryptopp/3way.h
+include/cryptopp/adler32.h
+include/cryptopp/aes.h
+include/cryptopp/algebra.h
+include/cryptopp/arc4.h
+include/cryptopp/asn.h
+include/cryptopp/base64.h
+include/cryptopp/bench.h
+include/cryptopp/blowfish.h
+include/cryptopp/blumgold.h
+include/cryptopp/blumshub.h
+include/cryptopp/cast.h
+include/cryptopp/cbc.h
+include/cryptopp/cbcmac.h
+include/cryptopp/channels.h
+include/cryptopp/config.h
+include/cryptopp/crc.h
+include/cryptopp/cryptlib.h
+include/cryptopp/des.h
+include/cryptopp/default.h
+include/cryptopp/dh.h
+include/cryptopp/dh2.h
+include/cryptopp/diamond.h
+include/cryptopp/dmac.h
+include/cryptopp/dsa.h
+include/cryptopp/ec2n.h
+include/cryptopp/eccrypto.h
+include/cryptopp/ecp.h
+include/cryptopp/elgamal.h
+include/cryptopp/eprecomp.h
+include/cryptopp/files.h
+include/cryptopp/gf256.h
+include/cryptopp/filters.h
+include/cryptopp/gf2_32.h
+include/cryptopp/gf2n.h
+include/cryptopp/gost.h
+include/cryptopp/gzip.h
+include/cryptopp/haval.h
+include/cryptopp/hex.h
+include/cryptopp/hmac.h
+include/cryptopp/hrtimer.h
+include/cryptopp/ida.h
+include/cryptopp/idea.h
+include/cryptopp/integer.h
+include/cryptopp/iterhash.h
+include/cryptopp/lubyrack.h
+include/cryptopp/luc.h
+include/cryptopp/mars.h
+include/cryptopp/md2.h
+include/cryptopp/md5.h
+include/cryptopp/md5mac.h
+include/cryptopp/mdc.h
+include/cryptopp/misc.h
+include/cryptopp/modarith.h
+include/cryptopp/modes.h
+include/cryptopp/modexppc.h
+include/cryptopp/mqueue.h
+include/cryptopp/mqv.h
+include/cryptopp/nbtheory.h
+include/cryptopp/network.h
+include/cryptopp/nr.h
+include/cryptopp/oaep.h
+include/cryptopp/oids.h
+include/cryptopp/osrng.h
+include/cryptopp/panama.h
+include/cryptopp/pch.h
+include/cryptopp/pkcspad.h
+include/cryptopp/polynomi.h
+include/cryptopp/pssr.h
+include/cryptopp/pubkey.h
+include/cryptopp/queue.h
+include/cryptopp/rabin.h
+include/cryptopp/randpool.h
+include/cryptopp/rc2.h
+include/cryptopp/rc5.h
+include/cryptopp/rc6.h
+include/cryptopp/rijndael.h
+include/cryptopp/ripemd.h
+include/cryptopp/rng.h
+include/cryptopp/rsa.h
+include/cryptopp/rw.h
+include/cryptopp/safer.h
+include/cryptopp/sapphire.h
+include/cryptopp/seal.h
+include/cryptopp/secshare.h
+include/cryptopp/serpent.h
+include/cryptopp/sha.h
+include/cryptopp/shark.h
+include/cryptopp/skipjack.h
+include/cryptopp/smartptr.h
+include/cryptopp/socketft.h
+include/cryptopp/square.h
+include/cryptopp/tea.h
+include/cryptopp/tiger.h
+include/cryptopp/twofish.h
+include/cryptopp/validate.h
+include/cryptopp/wake.h
+include/cryptopp/winpipes.h
+include/cryptopp/words.h
+include/cryptopp/xormac.h
+include/cryptopp/xtr.h
+include/cryptopp/xtrcrypt.h
+include/cryptopp/zdeflate.h
+include/cryptopp/zinflate.h
+include/cryptopp/zlib.h
+@dirrm include/cryptopp
+%%PORTDOCS%%share/doc/cryptopp/README
+%%PORTDOCS%%@dirrm share/doc/cryptopp