diff --git a/databases/postgresql-pllua/Makefile b/databases/postgresql-pllua/Makefile
index b6ddf541935..f3da83e8c90 100644
--- a/databases/postgresql-pllua/Makefile
+++ b/databases/postgresql-pllua/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.12 2018/12/02 13:26:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2019/02/19 05:10:51 jeremy Exp $
 
 COMMENT =		Lua procedural language support for PostgreSQL
 
-VERSION =		1.0
-DISTNAME =		pllua-${VERSION}
+VERSION =		1.1.0
+DISTNAME =		v${VERSION}
 PKGNAME =		postgresql-pllua-${VERSION}
-REVISION =	4
 
 CATEGORIES =		databases
 
-HOMEPAGE =		http://pllua.projects.postgresql.org/
+HOMEPAGE =		https://github.com/pllua/pllua
 
 MAINTAINER =		Jeremy Evans <jeremy@openbsd.org>
 
@@ -18,15 +17,21 @@ PERMIT_PACKAGE_CDROM =	Yes
 
 WANTLIB =		c ${MODLUA_WANTLIB}
 
-MASTER_SITES =		http://pgfoundry.org/frs/download.php/3481/
+MASTER_SITES =		https://github.com/pllua/pllua/archive/
+MASTER_SITES0 =		https://github.com/pllua/pllua/commit/
+
+PATCH_DIST_STRIP =	-p1
+PATCHFILES =		3fcf91f71b8a8a6ceb46b59b132ed8d7cc81eb63.diff:0 \
+			3d926a6b0117f168e7a29a18bb16110fea2957c2.diff:0
 
 MODULES =		lang/lua
-BUILD_DEPENDS =		${RUN_DEPENDS}
-RUN_DEPENDS =		postgresql-server->=10,<11:databases/postgresql,-server
+BUILD_DEPENDS =		${RUN_DEPENDS} \
+			postgresql-client->=11,<12:databases/postgresql,-main
+RUN_DEPENDS =		postgresql-server->=11,<12:databases/postgresql,-server
 
 USE_GMAKE =		Yes
 
-WRKDIST =		${WRKDIR}/pllua-0.3.2
+WRKDIST =		${WRKDIR}/pllua-1.1.0
 SUBST_VARS =		MODLUA_INCL_DIR MODLUA_WANTLIB
 
 pre-configure:
diff --git a/databases/postgresql-pllua/distinfo b/databases/postgresql-pllua/distinfo
index 255ddb84baf..a8b5bb14540 100644
--- a/databases/postgresql-pllua/distinfo
+++ b/databases/postgresql-pllua/distinfo
@@ -1,2 +1,6 @@
-SHA256 (pllua-1.0.tar.gz) = ThEbqnpiwvVXZ6eNMCg67Tj3poWEJGh5NgYiYuC6p0I=
-SIZE (pllua-1.0.tar.gz) = 31324
+SHA256 (3d926a6b0117f168e7a29a18bb16110fea2957c2.diff) = sZaSN8X5qFlXiYse226goM2l46g4af7Ha3wp/Bvuw/k=
+SHA256 (3fcf91f71b8a8a6ceb46b59b132ed8d7cc81eb63.diff) = clMmZMUXJ3naJXriZ6CRStRb6L/OFyBxKf3Tqq++WAk=
+SHA256 (v1.1.0.tar.gz) = LIpFfG3stYm1ukAp9IanwEZFMPh8y4Ngkh5NdmD+aXE=
+SIZE (3d926a6b0117f168e7a29a18bb16110fea2957c2.diff) = 9711
+SIZE (3fcf91f71b8a8a6ceb46b59b132ed8d7cc81eb63.diff) = 8005
+SIZE (v1.1.0.tar.gz) = 53205
diff --git a/databases/postgresql-pllua/patches/patch-Makefile b/databases/postgresql-pllua/patches/patch-Makefile
index cb68b881cb6..c2b7593ae25 100644
--- a/databases/postgresql-pllua/patches/patch-Makefile
+++ b/databases/postgresql-pllua/patches/patch-Makefile
@@ -1,14 +1,16 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2012/10/10 10:41:36 jeremy Exp $
---- Makefile.orig	Tue Oct  9 17:27:48 2012
-+++ Makefile	Tue Oct  9 17:30:08 2012
-@@ -4,8 +4,8 @@
+$OpenBSD: patch-Makefile,v 1.2 2019/02/19 05:10:51 jeremy Exp $
+
+Index: Makefile
+--- Makefile.orig
++++ Makefile
+@@ -6,8 +6,8 @@ PKG_LIBDIR := $(shell $(PG_CONFIG) --pkglibdir)
  # Lua specific
  
  # General
--LUAINC =
--LUALIB = -llua
-+LUAINC = -I${MODLUA_INCL_DIR}
-+LUALIB = -L${LOCALBASE}/lib -l${MODLUA_WANTLIB}
+-LUA_INCDIR ?= /usr/include/lua5.1
+-LUALIB ?= -L/usr/local/lib -llua5.1
++LUA_INCDIR ?= ${MODLUA_INCL_DIR}
++LUALIB ?= -L${LOCALBASE}/lib -l${MODLUA_WANTLIB}
  
- # Debian/Ubuntu
- #LUAINC = -I/usr/include/lua5.1
+ # LuaJIT
+ #LUA_INCDIR = /usr/local/include/luajit-2.0
diff --git a/databases/postgresql-pllua/patches/patch-pllua_h b/databases/postgresql-pllua/patches/patch-pllua_h
deleted file mode 100644
index 36b13cb0a4f..00000000000
--- a/databases/postgresql-pllua/patches/patch-pllua_h
+++ /dev/null
@@ -1,23 +0,0 @@
-$OpenBSD: patch-pllua_h,v 1.2 2013/10/15 02:21:13 jeremy Exp $
-
-Recent versions of PostgreSQL require an extra header to get the
-Relation struct defintion, and pllua hasn't been updated recently.
-
---- pllua.h.orig	Sun Sep 20 07:22:21 2009
-+++ pllua.h	Thu Oct  3 13:17:41 2013
-@@ -11,6 +11,7 @@
- #include <fmgr.h>
- #include <funcapi.h>
- #include <access/heapam.h>
-+#include "access/htup_details.h"
- #include <catalog/namespace.h>
- #include <catalog/pg_proc.h>
- #include <catalog/pg_type.h>
-@@ -25,6 +26,7 @@
- #include <utils/datum.h>
- #include <utils/builtins.h>
- #include <utils/array.h>
-+#include <utils/rel.h>
- /* Lua */
- #include <lua.h>
- #include <lualib.h>
diff --git a/databases/postgresql-pllua/patches/patch-plluaapi_c b/databases/postgresql-pllua/patches/patch-plluaapi_c
deleted file mode 100644
index eeb28f7d11e..00000000000
--- a/databases/postgresql-pllua/patches/patch-plluaapi_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-plluaapi_c,v 1.1 2013/10/15 02:21:13 jeremy Exp $
---- plluaapi.c.orig	Thu Oct  3 13:09:19 2013
-+++ plluaapi.c	Thu Oct  3 13:09:56 2013
-@@ -22,7 +22,7 @@ typedef struct luaP_Info {
- /* extended type info */
- typedef struct luaP_Typeinfo {
-   int oid;
--  int2 len;
-+  int16 len;
-   char type;
-   char align;
-   bool byval;
diff --git a/databases/postgresql-pllua/pkg/PLIST b/databases/postgresql-pllua/pkg/PLIST
index 18a2654e066..b46071ecaee 100644
--- a/databases/postgresql-pllua/pkg/PLIST
+++ b/databases/postgresql-pllua/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.2 2018/09/04 12:46:10 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2019/02/19 05:10:51 jeremy Exp $
 lib/postgresql/pllua.so
 share/doc/pkg-readmes/${PKGSTEM}
-share/postgresql/contrib/
-share/postgresql/contrib/pllua.sql
+share/postgresql/extension/pllua--1.0.sql
+share/postgresql/extension/pllua.control