diff --git a/data/postgresql12/Makefile b/data/postgresql12/Makefile
index b9d2c062..e8752af1 100644
--- a/data/postgresql12/Makefile
+++ b/data/postgresql12/Makefile
@@ -61,6 +61,7 @@ CONFIGURE_ARGS+= --enable-depend
 
 CONFIGURE_ARGS+= --without-ldap
 CONFIGURE_ARGS+= --with-openssl
+CONFIGURE_ARGS+= --with-uuid=bsd
 
 #CONFIGURE_ARGS+= --with-libedit-preferred
 #CFLAGS+=	-I/usr/include/edit
diff --git a/data/postgresql12/files/patch-x-contrib-Makefile b/data/postgresql12/files/patch-x-contrib-Makefile
index bc13955c..47033ee5 100644
--- a/data/postgresql12/files/patch-x-contrib-Makefile
+++ b/data/postgresql12/files/patch-x-contrib-Makefile
@@ -5,7 +5,7 @@
  
  SUBDIRS = \
 +		oid2name	\
-+		vacuumlo
++		vacuumlo pgcrypto tablefunc uuid-ossp
 +
 +
 +NOSUBDIRS = \
diff --git a/data/postgresql12/pkg-plist b/data/postgresql12/pkg-plist
index 331b9ee2..3ede960a 100644
--- a/data/postgresql12/pkg-plist
+++ b/data/postgresql12/pkg-plist
@@ -854,6 +854,7 @@ lib/postgresql/euc2004_sjis2004.so
 lib/postgresql/latin_and_mic.so
 lib/postgresql/latin2_and_win1250.so
 lib/postgresql/libpqwalreceiver.so
+lib/postgresql/pgcrypto.so
 lib/postgresql/pgoutput.so
 lib/postgresql/pgxs/config/install-sh
 lib/postgresql/pgxs/config/missing
@@ -864,6 +865,7 @@ lib/postgresql/pgxs/src/makefiles/pgxs.mk
 lib/postgresql/pgxs/src/nls-global.mk
 lib/postgresql/pgxs/src/test/regress/pg_regress
 lib/postgresql/plpgsql.so
+lib/postgresql/tablefunc.so
 lib/postgresql/utf8_and_ascii.so
 lib/postgresql/utf8_and_big5.so
 lib/postgresql/utf8_and_cyrillic.so
@@ -881,6 +883,7 @@ lib/postgresql/utf8_and_sjis.so
 lib/postgresql/utf8_and_sjis2004.so
 lib/postgresql/utf8_and_uhc.so
 lib/postgresql/utf8_and_win.so
+lib/postgresql/uuid-ossp.so
 man/man1/ecpg.1.gz
 man/man1/pg_archivecleanup.1.gz
 man/man1/pg_basebackup.1.gz
@@ -1171,9 +1174,22 @@ man/man7/VACUUM.7.gz
 man/man7/VALUES.7.gz
 man/man7/WITH.7.gz
 share/postgresql/errcodes.txt
+share/postgresql/extension/pgcrypto--1.0--1.1.sql
+share/postgresql/extension/pgcrypto--1.1--1.2.sql
+share/postgresql/extension/pgcrypto--1.2--1.3.sql
+share/postgresql/extension/pgcrypto--1.3.sql
+share/postgresql/extension/pgcrypto--unpackaged--1.0.sql
+share/postgresql/extension/pgcrypto.control
 share/postgresql/extension/plpgsql--1.0.sql
 share/postgresql/extension/plpgsql--unpackaged--1.0.sql
 share/postgresql/extension/plpgsql.control
+share/postgresql/extension/tablefunc--1.0.sql
+share/postgresql/extension/tablefunc--unpackaged--1.0.sql
+share/postgresql/extension/tablefunc.control
+share/postgresql/extension/uuid-ossp--1.0--1.1.sql
+share/postgresql/extension/uuid-ossp--1.1.sql
+share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql
+share/postgresql/extension/uuid-ossp.control
 share/postgresql/information_schema.sql
 share/postgresql/locale/cs/LC_MESSAGES/ecpg-12.mo
 share/postgresql/locale/cs/LC_MESSAGES/ecpglib6-12.mo
diff --git a/data/timescaledb/Makefile b/data/timescaledb/Makefile
new file mode 100644
index 00000000..34305ba7
--- /dev/null
+++ b/data/timescaledb/Makefile
@@ -0,0 +1,23 @@
+# Created by: Kevin Bowling <kbowling@freebsd.org>
+# $FreeBSD: head/databases/timescaledb/Makefile 566319 2021-02-22 17:37:36Z kbowling $
+
+PORTNAME=	timescaledb
+PORTVERSION=	2.1.0
+CATEGORIES=	databases
+
+MAINTAINER=	kbowling@FreeBSD.org
+COMMENT=	Time-series database built on PostgreSQL
+
+USES=		compiler:c11 cmake #pgsql:11,12,13
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	timescale
+
+CFLAGS+= -I${LOCALBASE}/include
+LDFALSG+= -L${LOCALBASE}/lib
+
+CMAKE_ON+=	USE_OPENSSL 
+#CMAKE_OFF+=	APACHE_ONLY
+CMAKE_OFF+=	REGRESS_CHECKS WARNINGS_AS_ERRORS
+
+.include <bsd.port.mk>
diff --git a/data/timescaledb/distinfo b/data/timescaledb/distinfo
new file mode 100644
index 00000000..809528d2
--- /dev/null
+++ b/data/timescaledb/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1614015010
+SHA256 (timescale-timescaledb-2.1.0_GH0.tar.gz) = 6de2af2ecfd7bff9b3634b6c5c29b209b25e147858d460469e8eb88e6d198692
+SIZE (timescale-timescaledb-2.1.0_GH0.tar.gz) = 2527250
diff --git a/data/timescaledb/files/pkg-message.in b/data/timescaledb/files/pkg-message.in
new file mode 100644
index 00000000..2ba06310
--- /dev/null
+++ b/data/timescaledb/files/pkg-message.in
@@ -0,0 +1,13 @@
+[
+{ type: install
+  message: <<EOM
+To activate timescaledb on your PostgreSQL server, add 'timescaledb' to
+shared_preload_libraries in $PGDATA/postgresql.conf. For every database,
+run
+	CREATE EXTENSION IF NOT EXISTS timescaledb CASCADE;
+
+If you are upgrading, restart PostgreSQL server and run
+	ALTER EXTENSION timescaledb UPDATE TO '%%PORTVERSION%%';
+EOM
+}
+]
diff --git a/data/timescaledb/pkg-descr b/data/timescaledb/pkg-descr
new file mode 100644
index 00000000..08331bfb
--- /dev/null
+++ b/data/timescaledb/pkg-descr
@@ -0,0 +1,4 @@
+An open-source time-series database optimized for fast ingest and complex
+queries built on PostgreSQL.
+
+WWW: http://www.timescale.com/
diff --git a/data/timescaledb/pkg-plist b/data/timescaledb/pkg-plist
new file mode 100644
index 00000000..df104b2e
--- /dev/null
+++ b/data/timescaledb/pkg-plist
@@ -0,0 +1,33 @@
+lib/postgresql/timescaledb-2.1.0.so
+lib/postgresql/timescaledb-tsl-2.1.0.so
+lib/postgresql/timescaledb.so
+share/postgresql/extension/timescaledb--1.1.0--2.1.0.sql
+share/postgresql/extension/timescaledb--1.1.1--2.1.0.sql
+share/postgresql/extension/timescaledb--1.2.0--2.1.0.sql
+share/postgresql/extension/timescaledb--1.2.1--2.1.0.sql
+share/postgresql/extension/timescaledb--1.2.2--2.1.0.sql
+share/postgresql/extension/timescaledb--1.3.0--2.1.0.sql
+share/postgresql/extension/timescaledb--1.3.1--2.1.0.sql
+share/postgresql/extension/timescaledb--1.3.2--2.1.0.sql
+share/postgresql/extension/timescaledb--1.4.0--2.1.0.sql
+share/postgresql/extension/timescaledb--1.4.1--2.1.0.sql
+share/postgresql/extension/timescaledb--1.4.2--2.1.0.sql
+share/postgresql/extension/timescaledb--1.5.0--2.1.0.sql
+share/postgresql/extension/timescaledb--1.5.1--2.1.0.sql
+share/postgresql/extension/timescaledb--1.6.0--2.1.0.sql
+share/postgresql/extension/timescaledb--1.6.1--2.1.0.sql
+share/postgresql/extension/timescaledb--1.7.0--2.1.0.sql
+share/postgresql/extension/timescaledb--1.7.1--2.1.0.sql
+share/postgresql/extension/timescaledb--1.7.2--2.1.0.sql
+share/postgresql/extension/timescaledb--1.7.3--2.1.0.sql
+share/postgresql/extension/timescaledb--1.7.4--2.1.0.sql
+share/postgresql/extension/timescaledb--1.7.5--2.1.0.sql
+share/postgresql/extension/timescaledb--2.0.0--2.1.0.sql
+share/postgresql/extension/timescaledb--2.0.0-rc1--2.1.0.sql
+share/postgresql/extension/timescaledb--2.0.0-rc2--2.1.0.sql
+share/postgresql/extension/timescaledb--2.0.0-rc3--2.1.0.sql
+share/postgresql/extension/timescaledb--2.0.0-rc4--2.1.0.sql
+share/postgresql/extension/timescaledb--2.0.1--2.1.0.sql
+share/postgresql/extension/timescaledb--2.0.2--2.1.0.sql
+share/postgresql/extension/timescaledb--2.1.0.sql
+share/postgresql/extension/timescaledb.control