Index: head/security/libkpass/Makefile
===================================================================
--- head/security/libkpass/Makefile
+++ head/security/libkpass/Makefile
@@ -2,18 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	libkpass
-PORTVERSION=	5
-PORTREVISION=	1
+PORTVERSION=	6
 CATEGORIES=	security
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Library for a reading/writing KeePass 1.x DB
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libnettle.so:security/nettle
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	bldewolf
+
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		alias gettext gmake libtool
Index: head/security/libkpass/distinfo
===================================================================
--- head/security/libkpass/distinfo
+++ head/security/libkpass/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libkpass-5.tar.gz) = 72bea97b2a2f5a68bdf52b3a67fc38028fcd295b016169e05c631fec9596faca
-SIZE (libkpass-5.tar.gz) = 402843
+TIMESTAMP = 1474639255
+SHA256 (bldewolf-libkpass-6_GH0.tar.gz) = b0669300c72ec04b6c1fe7628b169006ac07239ff48e863bbd80eb5a3a369938
+SIZE (bldewolf-libkpass-6_GH0.tar.gz) = 406767
Index: head/security/libkpass/files/patch-src_kpass.c
===================================================================
--- head/security/libkpass/files/patch-src_kpass.c
+++ head/security/libkpass/files/patch-src_kpass.c
@@ -1,14 +0,0 @@
---- src/kpass.c.orig	2013-04-01 18:36:50.878364960 +0000
-+++ src/kpass.c	2013-04-01 18:37:43.162887560 +0000
-@@ -23,7 +23,11 @@
- #include <nettle/aes.h>
- #include <nettle/sha.h>
- #include <nettle/cbc.h>
-+#ifdef __FreeBSD__
-+#include <sys/endian.h>
-+#else
- #include <byteswap.h>
-+#endif
- #include <time.h>
- 
- #include <libintl.h>