diff --git a/databases/epgsql/Makefile b/databases/epgsql/Makefile
index 6bc6cbf2dbbc..c91586494ef0 100644
--- a/databases/epgsql/Makefile
+++ b/databases/epgsql/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	epgsql
-PORTVERSION=	2.0.0
+PORTVERSION=	3.1.0
 CATEGORIES=	databases
 
 MAINTAINER=	olgeni@FreeBSD.org
@@ -19,19 +19,12 @@ USES=		gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	epgsql
 GH_PROJECT=	epgsql
-GH_COMMIT=	c7dfb06
-GH_TAGNAME=	${PORTVERSION}
-
-PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e "s/%%PORTVERSION%%/${PORTVERSION}/" ${WRKSRC}/src/epgsql.app.src
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/epgsql-${PORTVERSION}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/epgsql-${PORTVERSION}/ebin
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/erlang/lib/epgsql-${PORTVERSION}/include
diff --git a/databases/epgsql/distinfo b/databases/epgsql/distinfo
index aca3af94e908..008b9153615a 100644
--- a/databases/epgsql/distinfo
+++ b/databases/epgsql/distinfo
@@ -1,2 +1,2 @@
-SHA256 (epgsql-2.0.0.tar.gz) = 9fc0168e09336feb02e3dc82a69efc04d303e520f2b667beab2215c092feeef5
-SIZE (epgsql-2.0.0.tar.gz) = 31264
+SHA256 (epgsql-epgsql-3.1.0_GH0.tar.gz) = f4bb50676ac31d1ee50cd8337d5985b4f6d58ae3c2e07a04ed06dfb29b051884
+SIZE (epgsql-epgsql-3.1.0_GH0.tar.gz) = 39799
diff --git a/databases/epgsql/files/patch-src_epgsql.app.src b/databases/epgsql/files/patch-src_epgsql.app.src
deleted file mode 100644
index 2c9b8267d4e8..000000000000
--- a/databases/epgsql/files/patch-src_epgsql.app.src
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- src/epgsql.app.src.orig
-+++ src/epgsql.app.src
-@@ -1,6 +1,6 @@
- {application, epgsql,
-  [{description, "PostgreSQL Client"},
--  {vsn, git},
-+  {vsn, "%%PORTVERSION%%"},
-   {modules, []},
-   {registered, []},
-   {applications, [kernel,
diff --git a/databases/epgsql/pkg-plist b/databases/epgsql/pkg-plist
index f5dc21c2a0ba..c3e372f91dff 100644
--- a/databases/epgsql/pkg-plist
+++ b/databases/epgsql/pkg-plist
@@ -1,22 +1,26 @@
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/apgsql.beam
 lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql.app
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/ipgsql.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/pgsql.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/pgsql_binary.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/pgsql_fdatetime.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/pgsql_idatetime.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/pgsql_sock.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/pgsql_types.beam
-lib/erlang/lib/epgsql-%%VERSION%%/ebin/pgsql_wire.beam
-lib/erlang/lib/epgsql-%%VERSION%%/include/pgsql.hrl
-lib/erlang/lib/epgsql-%%VERSION%%/include/pgsql_binary.hrl
-lib/erlang/lib/epgsql-%%VERSION%%/src/apgsql.erl
+lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql.beam
+lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_binary.beam
+lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_fdatetime.beam
+lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_idatetime.beam
+lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_sock.beam
+lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_types.beam
+lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsql_wire.beam
+lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsqla.beam
+lib/erlang/lib/epgsql-%%VERSION%%/ebin/epgsqli.beam
+lib/erlang/lib/epgsql-%%VERSION%%/ebin/ewkb.beam
+lib/erlang/lib/epgsql-%%VERSION%%/include/epgsql.hrl
+lib/erlang/lib/epgsql-%%VERSION%%/include/epgsql_binary.hrl
+lib/erlang/lib/epgsql-%%VERSION%%/include/epgsql_geometry.hrl
 lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql.app.src
-lib/erlang/lib/epgsql-%%VERSION%%/src/ipgsql.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/pgsql.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/pgsql_binary.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/pgsql_fdatetime.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/pgsql_idatetime.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/pgsql_sock.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/pgsql_types.erl
-lib/erlang/lib/epgsql-%%VERSION%%/src/pgsql_wire.erl
+lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql.erl
+lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_binary.erl
+lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_fdatetime.erl
+lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_idatetime.erl
+lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_sock.erl
+lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_types.erl
+lib/erlang/lib/epgsql-%%VERSION%%/src/epgsql_wire.erl
+lib/erlang/lib/epgsql-%%VERSION%%/src/epgsqla.erl
+lib/erlang/lib/epgsql-%%VERSION%%/src/epgsqli.erl
+lib/erlang/lib/epgsql-%%VERSION%%/src/ewkb.erl
+%%PORTDOCS%%%%DOCSDIR%%/README.md