diff --git a/srcpkgs/kore/makefile.patch b/srcpkgs/kore/makefile.patch
new file mode 100644
index 00000000000..f618ad91195
--- /dev/null
+++ b/srcpkgs/kore/makefile.patch
@@ -0,0 +1,37 @@
+--- Makefile	2018-12-01 10:49:16.048504860 +0100
++++ Makefile	2018-12-01 10:50:04.173829007 +0100
+@@ -6,10 +6,10 @@
+ KORE=kore
+ KODEV=kodev/kodev
+ KORE_CRYPTO?=crypto
+-INSTALL_DIR=$(PREFIX)/bin
+-MAN_DIR=$(PREFIX)/share/man
+-SHARE_DIR=$(PREFIX)/share/kore
+-INCLUDE_DIR=$(PREFIX)/include/kore
++INSTALL_DIR=$(DESTDIR)/$(PREFIX)/bin
++MAN_DIR=$(DESTDIR)/$(PREFIX)/share/man
++SHARE_DIR=$(DESTDIR)/$(PREFIX)/share/kore
++INCLUDE_DIR=$(DESTDIR)/$(PREFIX)/include/kore
+ 
+ VERSION=src/version.c
+ 
+@@ -21,7 +21,7 @@
+ FEATURES=
+ FEATURES_INC=
+ 
+-CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
++CFLAGS::=$(CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
+ CFLAGS+=-Wmissing-declarations -Wshadow -Wpointer-arith -Wcast-qual
+ CFLAGS+=-Wsign-compare -Iinclude/kore -std=c99 -pedantic
+ CFLAGS+=-DPREFIX='"$(PREFIX)"' -fstack-protector-all
+--- kodev/Makefile.orig	2018-12-01 10:53:51.779628063 +0100
++++ kodev/Makefile	2018-12-01 10:54:18.675249411 +0100
+@@ -4,7 +4,7 @@
+ PREFIX?=/usr/local
+ OBJDIR?=obj
+ KODEV=kodev
+-INSTALL_DIR=$(PREFIX)/bin
++INSTALL_DIR=$(DESTDIR)/$(PREFIX)/bin
+ 
+ S_SRC=	../src/cli.c
+ 
diff --git a/srcpkgs/kore/patches/makefile.patch b/srcpkgs/kore/patches/makefile.patch
index f618ad91195..bd3103c49eb 100644
--- a/srcpkgs/kore/patches/makefile.patch
+++ b/srcpkgs/kore/patches/makefile.patch
@@ -1,31 +1,31 @@
---- Makefile	2018-12-01 10:49:16.048504860 +0100
-+++ Makefile	2018-12-01 10:50:04.173829007 +0100
+--- Makefile	2020-09-02 14:08:01.518084761 +0200
++++ Makefile	2020-09-02 14:09:50.656087454 +0200
 @@ -6,10 +6,10 @@
  KORE=kore
  KODEV=kodev/kodev
  KORE_CRYPTO?=crypto
 -INSTALL_DIR=$(PREFIX)/bin
--MAN_DIR=$(PREFIX)/share/man
+-MAN_DIR?=$(PREFIX)/share/man
 -SHARE_DIR=$(PREFIX)/share/kore
 -INCLUDE_DIR=$(PREFIX)/include/kore
 +INSTALL_DIR=$(DESTDIR)/$(PREFIX)/bin
-+MAN_DIR=$(DESTDIR)/$(PREFIX)/share/man
++MAN_DIR?=$(DESTDIR)/$(PREFIX)/share/man
 +SHARE_DIR=$(DESTDIR)/$(PREFIX)/share/kore
 +INCLUDE_DIR=$(DESTDIR)/$(PREFIX)/include/kore
  
- VERSION=src/version.c
- 
-@@ -21,7 +21,7 @@
+ GENERATED=
+ PLATFORM=platform.h
+@@ -24,7 +24,7 @@
  FEATURES=
  FEATURES_INC=
  
 -CFLAGS+=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
 +CFLAGS::=$(CFLAGS) -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
  CFLAGS+=-Wmissing-declarations -Wshadow -Wpointer-arith -Wcast-qual
- CFLAGS+=-Wsign-compare -Iinclude/kore -std=c99 -pedantic
+ CFLAGS+=-Wsign-compare -Iinclude/kore -I$(OBJDIR) -std=c99 -pedantic
  CFLAGS+=-DPREFIX='"$(PREFIX)"' -fstack-protector-all
---- kodev/Makefile.orig	2018-12-01 10:53:51.779628063 +0100
-+++ kodev/Makefile	2018-12-01 10:54:18.675249411 +0100
+--- kodev/Makefile	2020-09-02 14:09:58.072087637 +0200
++++ kodev/Makefile	2020-09-02 14:10:17.774088123 +0200
 @@ -4,7 +4,7 @@
  PREFIX?=/usr/local
  OBJDIR?=obj
diff --git a/srcpkgs/kore/patches/platform.patch b/srcpkgs/kore/patches/platform.patch
new file mode 100644
index 00000000000..ecad9ae9b69
--- /dev/null
+++ b/srcpkgs/kore/patches/platform.patch
@@ -0,0 +1,11 @@
+--- ./misc/linux-platform.sh	2020-09-02 14:26:51.393112635 +0200
++++ ./misc/linux-platform.sh	2020-09-02 14:28:26.281114976 +0200
+@@ -2,7 +2,7 @@
+ #
+ # Linux specific defines and system call maps.
+ 
+-PLATFORM=$(uname -m)
++PLATFORM=${XBPS_TARGET_MACHINE}
+ BASE=$(dirname $0)
+ 
+ case "$PLATFORM" in
diff --git a/srcpkgs/kore/template b/srcpkgs/kore/template
index a31cdf1802b..b2cff305837 100644
--- a/srcpkgs/kore/template
+++ b/srcpkgs/kore/template
@@ -1,22 +1,33 @@
 # Template file for 'kore'
 pkgname=kore
-version=3.3.1
-revision=3
+version=4.0.0
+revision=1
 build_style=gnu-makefile
 make_use_env=yes
-make_build_args="PREFIX=/usr"
-makedepends="libressl-devel"
+make_build_args="PREFIX=/usr CURL=1 TASKS=1 PGSQL=1 JSONRPC=1 ACME=1"
+hostmakedepends="postgresql-libs-devel"
+makedepends="libressl-devel libcurl-devel postgresql-libs-devel yajl-devel"
 short_desc="Easy to use web platform for writing scalable web APIs in C"
 maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="ISC"
 homepage="https://kore.io"
 distfiles="https://kore.io/releases/kore-${version}.tar.gz"
-checksum=c80d7a817883e631adf9eb5271b4ffa6ebb06c2e2fca40ce6c3c75638c08b67a
+checksum=c4f5629c9fca7ede7664063a318021f58c7909cbff822dad8dca88da7d9043c2
+disable_parallel_build=yes
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-legacy-compat"
 fi
 
+if [ "$XBPS_TARGET_WORDSIZE" == "32" ]; then
+	broken="Requires syscalls not available on 32 bit architectures"
+fi
+
+if [ -z "$CROSS_BUILD" ]; then
+	makedepends+=" python3-devel"
+	make_build_args+="PYTHON=1"
+fi
+
 post_install() {
 	vlicense LICENSE
 }