diff -ruN libscrypt-org/Makefile libscrypt/Makefile
--- libscrypt-org/Makefile	2013-07-28 12:51:54.000000000 -0400
+++ libscrypt/Makefile	2013-09-13 15:22:54.000000000 -0400
@@ -2,31 +2,40 @@
 # $FreeBSD: security/libscrypt/Makefile 323838 2013-07-28 16:51:54Z vanilla $
 
 PORTNAME=	libscrypt
-PORTVERSION=	1.1
+PORTVERSION=	1.14
 CATEGORIES=	security
 
 MAINTAINER=	horia@racoviceanu.com
 COMMENT=	C library for the scrypt key derivation function
 
 LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	technion
-GH_COMMIT=	49f9136
-GH_TAGNAME=	v${PORTVERSION}
+GH_TAGNAME=	${GH_COMMIT}
+GH_COMMIT=	8e6966e
 
-PLIST_FILES+=	include/libscrypt.h \
+PLIST_FILES=	include/libscrypt.h \
 		lib/libscrypt.a \
 		lib/libscrypt.so \
 		lib/libscrypt.so.0
 
+.include <bsd.port.pre.mk>
+
 post-patch:
-	${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s,$$, ${CFLAGS},' \
-	    -e 's,/usr/local,${PREFIX},' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s,$$, ${CFLAGS},' \
+	    -e 's,/usr/local,${PREFIX},' -e 's,install: library,& install-static,' \
+	    -e 's,$$(LDFLAGS),,' ${WRKSRC}/Makefile
 
 regression-test: build
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check)
 
-.include <bsd.port.mk>
+.if ${ARCH} == i386
+CCVERSION!=	${CC} --version
+.  if !empty(CCVERSION:tl:M*gcc*)
+CFLAGS+=	-fno-stack-protector
+.  endif
+.endif
+
+.include <bsd.port.post.mk>
diff -ruN libscrypt-org/distinfo libscrypt/distinfo
--- libscrypt-org/distinfo	2013-07-28 12:51:54.000000000 -0400
+++ libscrypt/distinfo	2013-09-13 12:03:25.000000000 -0400
@@ -1,2 +1,2 @@
-SHA256 (libscrypt-1.1.tar.gz) = f6cec579980850604267566731e12d985f16739cd92b828fe28c326f6a7ee798
-SIZE (libscrypt-1.1.tar.gz) = 20276
+SHA256 (libscrypt-1.14.tar.gz) = 08d9f83eee4f2eb00c740357fd3648ce7d038ba4b5af2ee9fdc4319f76113e8b
+SIZE (libscrypt-1.14.tar.gz) = 20562