diff --git a/finance/ledger/Makefile b/finance/ledger/Makefile
index a05de9c..298e286 100644
--- a/finance/ledger/Makefile
+++ b/finance/ledger/Makefile
@@ -2,39 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	ledger
-PORTVERSION=	2.6.3
-PORTREVISION=	3
+PORTVERSION=	3.1
 CATEGORIES=	finance
-MASTER_SITES=	http://cloud.github.com/downloads/jwiegley/${PORTNAME}/
 
 MAINTAINER=	woodycarey@hotmail.com
 COMMENT=	John Wiegley's command line accounting program
 
 LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
+LICENSE_FILE=	${WRKSRC}/doc/LICENSE
 
+BUILD_DEPENDS=	${LOCALBASE}/include/utf8.h:${PORTSDIR}/devel/utf8cpp
 LIB_DEPENDS=	libgmp.so:${PORTSDIR}/math/gmp \
-		libpcre.so:${PORTSDIR}/devel/pcre \
-		libxmltok.so:${PORTSDIR}/www/libwww \
-		libxmlparse.so:${PORTSDIR}/www/libwww
+		libmpfr.so:${PORTSDIR}/math/mpfr \
+		libedit.so:${PORTSDIR}/devel/libedit \
+		libboost_system.so:${PORTSDIR}/devel/boost-libs
 
-USES=		libtool
-USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/w3c-libwww
-LDFLAGS+=	-L${LOCALBASE}/lib
+USE_GITHUB=	yes
+GH_ACCOUNT=	ledger
+GH_TAGNAME=	v${PORTVERSION}
+GH_COMMIT=	9df7fd4
 
-SUB_FILES=	pkg-message
+USES=		cmake
 
-INSTALL_TARGET=	install-strip
-
-INFO=	ledger
-
-post-install:
-	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/scripts
-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${STAGEDIR}${EXAMPLESDIR}/scripts/
-	${INSTALL_DATA} ${WRKSRC}/sample.dat ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/setup.py ${STAGEDIR}${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/ledger.vim ${STAGEDIR}${EXAMPLESDIR}
+CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${MANPREFIX}/man
 
 .include <bsd.port.mk>
diff --git a/finance/ledger/distinfo b/finance/ledger/distinfo
index 44a3db7..4417d8e 100644
--- a/finance/ledger/distinfo
+++ b/finance/ledger/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ledger-2.6.3.tar.gz) = b3ecd0174a3500bb96fe047617b1ee870cc5196deb0230393d933dceaeb7f717
-SIZE (ledger-2.6.3.tar.gz) = 660752
+SHA256 (ledger-3.1.tar.gz) = 97bd3dc14b88c2ec622b466e24011bc413485ec1c4e253093e3243ebb53da0b1
+SIZE (ledger-3.1.tar.gz) = 817824
diff --git a/finance/ledger/files/pkg-message.in b/finance/ledger/files/pkg-message.in
deleted file mode 100644
index ebdc179..0000000
--- a/finance/ledger/files/pkg-message.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-This port has installed sample data files, python samples and script samples
-for ledger in %%PREFIX%%/share/examples/ledger/
-Have fun!
diff --git a/finance/ledger/pkg-plist b/finance/ledger/pkg-plist
index ab8050a..5c8cfbd 100644
--- a/finance/ledger/pkg-plist
+++ b/finance/ledger/pkg-plist
@@ -1,52 +1,65 @@
 bin/ledger
-include/ledger/acconf.h
+include/ledger/account.h
 include/ledger/amount.h
+include/ledger/annotate.h
+include/ledger/archive.h
 include/ledger/balance.h
-include/ledger/binary.h
-include/ledger/config.h
+include/ledger/chain.h
+include/ledger/commodity.h
+include/ledger/compare.h
+include/ledger/context.h
+include/ledger/convert.h
 include/ledger/csv.h
-include/ledger/datetime.h
-include/ledger/debug.h
-include/ledger/derive.h
+include/ledger/draft.h
 include/ledger/emacs.h
 include/ledger/error.h
+include/ledger/expr.h
+include/ledger/exprbase.h
+include/ledger/filters.h
+include/ledger/flags.h
 include/ledger/format.h
-include/ledger/gnucash.h
+include/ledger/generate.h
+include/ledger/global.h
+include/ledger/history.h
+include/ledger/item.h
+include/ledger/iterators.h
 include/ledger/journal.h
-include/ledger/ledger.h
+include/ledger/lookup.h
 include/ledger/mask.h
-include/ledger/ofx.h
+include/ledger/op.h
 include/ledger/option.h
+include/ledger/org.h
+include/ledger/output.h
 include/ledger/parser.h
-include/ledger/qif.h
+include/ledger/pool.h
+include/ledger/post.h
+include/ledger/precmd.h
+include/ledger/predicate.h
+include/ledger/print.h
+include/ledger/pstream.h
+include/ledger/ptree.h
+include/ledger/pyfstream.h
+include/ledger/pyinterp.h
+include/ledger/pyutils.h
+include/ledger/query.h
 include/ledger/quotes.h
-include/ledger/reconcile.h
 include/ledger/report.h
-include/ledger/textual.h
-include/ledger/timing.h
-include/ledger/util.h
-include/ledger/valexpr.h
+include/ledger/scope.h
+include/ledger/select.h
+include/ledger/session.h
+include/ledger/stats.h
+include/ledger/stream.h
+include/ledger/strptime.h
+include/ledger/system.hh
+include/ledger/temps.h
+include/ledger/timelog.h
+include/ledger/times.h
+include/ledger/token.h
+include/ledger/unistring.h
+include/ledger/utils.h
 include/ledger/value.h
-include/ledger/walk.h
-include/ledger/xml.h
-lib/libamounts.a
-lib/libamounts.so
-lib/libamounts.so.0
-lib/libamounts.so.0.0.0
-lib/libledger-2.6.3.so
-lib/libledger.a
+include/ledger/views.h
+include/ledger/xact.h
 lib/libledger.so
-%%EXAMPLESDIR%%/ledger.vim
-%%EXAMPLESDIR%%/sample.dat
-%%EXAMPLESDIR%%/scripts/README
-%%EXAMPLESDIR%%/scripts/bal
-%%EXAMPLESDIR%%/scripts/bal-huquq
-%%EXAMPLESDIR%%/scripts/entry
-%%EXAMPLESDIR%%/scripts/getquote
-%%EXAMPLESDIR%%/scripts/ledger-du
-%%EXAMPLESDIR%%/scripts/report
-%%EXAMPLESDIR%%/scripts/tc
-%%EXAMPLESDIR%%/scripts/ti
-%%EXAMPLESDIR%%/scripts/to
-%%EXAMPLESDIR%%/scripts/trend
-%%EXAMPLESDIR%%/setup.py
+lib/libledger.so.3
+man/man1/ledger.1.gz