diff --git a/.gitignore b/.gitignore
index e76ef7cc785ea..2e67d7c8e6671 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,12 @@ lib*.pc
 /tmp_install/
 /portlock/
 /dist
+
+# emscripten build excludes
+*.cjs
+*.wasm
+pglite.data
+pglite.js
+pglite.html
+*.map
+pglite-wasm/excluded.imports
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000..9317a32956edc
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "pglite/pg_ivm"]
+	path = pglite/pg_ivm
+	url = https://github.com/sraoss/pg_ivm.git
+[submodule "pglite/pgvector"]
+	path = pglite/vector
+	url = https://github.com/pgvector/pgvector.git
diff --git a/build-pglite.sh b/build-pglite.sh
new file mode 100755
index 0000000000000..7fa05c3900d95
--- /dev/null
+++ b/build-pglite.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+### NOTES ###
+# $INSTALL_PREFIX is expected to point to the installation folder of various libraries built to wasm (see pglite-builder)
+#############
+
+# final output folder
+INSTALL_FOLDER=${INSTALL_FOLDER:-"/install/pglite"}
+
+# build with optimizations by default aka release
+PGLITE_CFLAGS="-O2"
+if [ "$DEBUG" = true ]
+then
+    echo "pglite: building debug version."
+    PGLITE_CFLAGS="-g -gsource-map --no-wasm-opt"
+else
+    echo "pglite: building release version."
+    # we shouldn't need to do this, but there's a bug somewhere that prevents a successful build if this is set
+    unset DEBUG
+fi
+
+echo "pglite: PGLITE_CFLAGS=$PGLITE_CFLAGS"
+
+# Step 1: configure the project
+LDFLAGS="-sWASM_BIGINT -sUSE_PTHREADS=0" CFLAGS="${PGLITE_CFLAGS} -sWASM_BIGINT -fpic -sENVIRONMENT=node,web,worker -sSUPPORT_LONGJMP=emscripten -DPYDK=1 -DCMA_MB=12 -Wno-declaration-after-statement -Wno-macro-redefined -Wno-unused-function -Wno-missing-prototypes -Wno-incompatible-pointer-types" emconfigure ./configure ac_cv_exeext=.cjs --disable-spinlocks --disable-largefile --without-llvm  --without-pam --disable-largefile --with-openssl=no --without-readline --without-icu --with-includes=$INSTALL_PREFIX/include:$INSTALL_PREFIX/include/libxml2 --with-libraries=$INSTALL_PREFIX/lib --with-uuid=ossp --with-zlib --with-libxml --with-libxslt --with-template=emscripten --prefix=$INSTALL_FOLDER || { echo 'error: emconfigure failed' ; exit 11; }
+
+# Step 2: make and install all except pglite
+emmake make PORTNAME=emscripten -j || { echo 'error: emmake make PORTNAME=emscripten -j' ; exit 21; }
+emmake make PORTNAME=emscripten install || { echo 'error: emmake make PORTNAME=emscripten install' ; exit 22; }
+
+# Step 3.1: make all contrib extensions - do not install
+emmake make PORTNAME=emscripten LDFLAGS_SL="-sSIDE_MODULE=1" -C contrib/ -j || { echo 'error: emmake make PORTNAME=emscripten -C contrib/ -j' ; exit 31; }
+# Step 3.2: make dist contrib extensions - this will create an archive for each extension
+emmake make PORTNAME=emscripten -C contrib/ dist || { echo 'error: emmake make PORTNAME=emscripten -C contrib/ dist' ; exit 32; }
+# the above will also create a file with the imports that each extension needs - we pass these as input in the next step for emscripten to keep alive
+
+# Step 4: make and dist other extensions
+SAVE_PATH=$PATH
+PATH=$PATH:$INSTALL_FOLDER/bin
+emmake make OPTFLAGS="" PORTNAME=emscripten -j -C pglite || { echo 'error: emmake make OPTFLAGS="" PORTNAME=emscripten -j -C pglite' ; exit 41; }
+emmake make OPTFLAGS="" PORTNAME=emscripten LDFLAGS_SL="-sSIDE_MODULE=1" -C pglite/ dist || { echo 'error: make OPTFLAGS="" PORTNAME=emscripten LDFLAGS_SL="-sSIDE_MODULE=1" -C pglite/ dist ' ; exit 42; }
+PATH=$SAVE_PATH
+
+# Step 5: make and install pglite
+# Building pglite itself needs to be the last step because of the PRELOAD_FILES parameter (a list of files and folders) need to be available.
+PGLITE_CFLAGS=$PGLITE_CFLAGS emmake make PORTNAME=emscripten -j -C src/backend/ install-pglite || { echo 'emmake make OPTFLAGS="" PORTNAME=emscripten -j -C pglite' ; exit 51; }
diff --git a/build-with-docker.sh b/build-with-docker.sh
new file mode 100755
index 0000000000000..d3d31a17fdc75
--- /dev/null
+++ b/build-with-docker.sh
@@ -0,0 +1,13 @@
+# although we could use any path inside docker, using the same path as on the host
+# allows the DWARF info (when building in DEBUG) to contain the correct file paths
+DOCKER_WORKSPACE=$(pwd)
+
+docker run $@ \
+  --rm \
+  -e DEBUG=${DEBUG:-false} \
+  --workdir=${DOCKER_WORKSPACE} \
+  -v .:${DOCKER_WORKSPACE}:rw \
+  -v ./dist:/install/pglite:rw \
+  electricsql/pglite-builder:3.1.74_1 \
+  ./build-pglite.sh
+  
diff --git a/clean-pglite.sh b/clean-pglite.sh
new file mode 100755
index 0000000000000..3d6c86458baa6
--- /dev/null
+++ b/clean-pglite.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+emmake make -C src/backend uninstall; emmake make -C src/backend clean;
+emmake make -C pglite/ clean; emmake make -C pglite/ uninstall;
+emmake make -C contrib/ clean; emmake make -C contrib/ uninstall; emmake make -C pglite clean; emmake make -C pglite uninstall;
+emmake make clean; emmake make uninstal
\ No newline at end of file
diff --git a/contrib/Makefile b/contrib/Makefile
index abd780f277405..603636cd4d248 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -90,6 +90,7 @@ endif
 # Missing:
 #		start-scripts	\ (does not have a makefile)
 
+include ./dist.mk
 
 $(recurse)
 $(recurse_always)
diff --git a/contrib/dist.mk b/contrib/dist.mk
new file mode 100644
index 0000000000000..df3933f01fb82
--- /dev/null
+++ b/contrib/dist.mk
@@ -0,0 +1,27 @@
+# contrib/dist.mk
+#
+# Package each contrib extension into its own .tar.gz archive
+
+prefix ?= /install/pglite
+CONTRIB_BUILD_ROOT := /tmp/extensions/build
+ARCHIVE_DIR := /install/pglite/extensions
+
+CONTRIBS := $(SUBDIRS)
+
+# Default target: build tarballs for all contribs
+dist: $(addsuffix .tar.gz,$(CONTRIBS))
+
+# Pattern rule: build $(EXT).tar.gz for each contrib
+%.tar.gz:
+	@echo "=== Staging $* ==="
+	rm -rf $(CONTRIB_BUILD_ROOT)/$*
+	bash -c 'mkdir -p $(CONTRIB_BUILD_ROOT)/$*/$(prefix)/{bin,lib,share/extension,share/doc,share/postgresql/extension,share/postgresql/tsearch_data,include}'
+	$(MAKE) -C $* install DESTDIR=$(CONTRIB_BUILD_ROOT)/$*
+	@echo "=== Packaging $* ==="
+	mkdir -p $(ARCHIVE_DIR)
+	cd $(CONTRIB_BUILD_ROOT)/$*/$(prefix) && \
+	files=$$(find . -type f -o -type l | sed 's|^\./||') && \
+	tar -czf $(ARCHIVE_DIR)/$*.tar.gz $$files
+# 	tar -C $(CONTRIB_BUILD_ROOT)/$*/$(prefix) -czf $(ARCHIVE_DIR)/$*.tar.gz .
+
+.PHONY: dist
diff --git a/other/PGPASSFILE b/other/PGPASSFILE
new file mode 100644
index 0000000000000..b8a0b5b6a58ac
--- /dev/null
+++ b/other/PGPASSFILE
@@ -0,0 +1,3 @@
+localhost:5432:postgres:password:md532e12f215ba27cb750c9e093ce4b5127
+localhost:5432:postgres:postgres:md53175bce1d3201d16594cebf9d7eb3f9d
+localhost:5432:postgres:login:md5d5745f9425eceb269f9fe01d0bef06ff
diff --git a/other/empty b/other/empty
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/other/password b/other/password
new file mode 100644
index 0000000000000..f3097ab13082b
--- /dev/null
+++ b/other/password
@@ -0,0 +1 @@
+password
diff --git a/pglite-wasm/builder/Dockerfile b/pglite-wasm/builder/Dockerfile
new file mode 100644
index 0000000000000..d8f5d931f75b1
--- /dev/null
+++ b/pglite-wasm/builder/Dockerfile
@@ -0,0 +1,89 @@
+ARG EMSDK_VER=3.1.74
+ARG BUILDPLATFORM
+# we only need to build on one platform, since we're interested in the WASM output
+# building on the native (BUILDPLATFORM) is much faster, so use that
+# remove "-arm64" suffix if building on x86_64
+FROM --platform=$BUILDPLATFORM emscripten/emsdk:${EMSDK_VER}-arm64 AS builder
+
+ENV LLVM_NM=/emsdk/upstream/bin/llvm-nm
+
+RUN apt update && apt upgrade -y && apt install -y \
+    xz-utils autoconf libtool automake pkgconf bison flex
+
+SHELL ["/bin/bash", "-c"]
+
+RUN mkdir -p /install/libs /install/exports
+
+WORKDIR /install/libs
+
+# zlib CAN be installed by using the emsdk like this
+# RUN embuilder --pic --verbose build zlib
+
+WORKDIR /src
+
+# ENV EMCC_COMMON_FLAGS="-fPIC -sWASM_BIGINT -sMIN_SAFARI_VERSION=150000 -D__PYDK__=1 -O2 -m32 -D_FILE_OFFSET_BITS=64 -sSUPPORT_LONGJMP=emscripten -mno-bulk-memory -mnontrapping-fptoint -mno-reference-types -mno-sign-ext -mno-extended-const -mno-atomics -mno-tail-call -mno-multivalue -mno-relaxed-simd -mno-simd128 -mno-multimemory -mno-exception-handling -Wno-unused-command-line-argument -Wno-unreachable-code-fallthrough -Wno-unused-function -Wno-invalid-noreturn -Wno-declaration-after-statement -Wno-invalid-noreturn"
+ENV EMCC_COMMON_FLAGS="-O2 -fPIC"
+
+WORKDIR /src
+RUN curl -L https://www.zlib.net/zlib-1.3.1.tar.gz | tar -xz
+WORKDIR /src/zlib-1.3.1
+RUN CFLAGS="${EMCC_COMMON_FLAGS}" CXXFLAGS="${EMCC_COMMON_FLAGS}" emconfigure ./configure --static --prefix=/install/libs
+RUN emmake make -j && emmake make install
+RUN ${LLVM_NM} /install/libs/lib/libz.a | awk '$2 ~ /^[TDB]$/ {print $3}' | sed '/^$/d' | sort -u > /install/exports/libz.exports
+
+WORKDIR /src
+RUN curl -L https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.14.5/libxml2-v2.14.5.tar.gz | tar -xz
+WORKDIR /src/libxml2-v2.14.5
+RUN ./autogen.sh --with-python=no
+RUN CFLAGS="${EMCC_COMMON_FLAGS}" CXXFLAGS="${EMCC_COMMON_FLAGS}" emconfigure ./configure --enable-shared=no --enable-static=yes --with-python=no --prefix=/install/libs
+RUN emmake make -j && emmake make install
+# extract exported symbols - useful for passing them to emscripten as EXPORTED_FUNCTIONS 
+RUN ${LLVM_NM} /install/libs/lib/libxml2.a | awk '$2 ~ /^[TDB]$/ {print $3}' | sed '/^$/d' | sort -u > /install/exports/libxml2.exports
+
+WORKDIR /src
+RUN curl -L https://gitlab.gnome.org/GNOME/libxslt/-/archive/v1.1.43/libxslt-v1.1.43.tar.gz | tar -xz
+WORKDIR /src/libxslt-v1.1.43
+RUN ./autogen.sh --with-python=no
+RUN CFLAGS="${EMCC_COMMON_FLAGS}" CXXFLAGS="${EMCC_COMMON_FLAGS}" emconfigure ./configure --enable-shared=no --enable-static=yes --with-python=no --prefix=/install/libs --with-libxml-src=/src/libxml2-v2.14.5/ --with-pic=yes
+RUN emmake make -j && emmake make install
+# extract exported symbols - useful for passing them to emscripten as EXPORTED_FUNCTIONS 
+RUN ${LLVM_NM} /install/libs/lib/libxslt.a | awk '$2 ~ /^[TDB]$/ {print $3}' | sed '/^$/d' | sort -u > /install/exports/libxslt.exports
+
+WORKDIR /src
+RUN curl -L https://github.com/openssl/openssl/releases/download/openssl-3.0.17/openssl-3.0.17.tar.gz | tar xz
+WORKDIR /src/openssl-3.0.17
+RUN emconfigure ./Configure no-tests linux-generic64 --prefix=/install/libs
+RUN sed -i 's|^CROSS_COMPILE.*$|CROSS_COMPILE=|g' Makefile # see https://github.com/emscripten-core/emscripten/issues/19597#issue-1754476454
+RUN emmake make -j && emmake make install
+# extract exported symbols - useful for passing them to emscripten as EXPORTED_FUNCTIONS 
+RUN ${LLVM_NM} /install/libs/lib/libssl.a | awk '$2 ~ /^[TDB]$/ {print $3}' | sed '/^$/d' | sort -u > /install/exports/libssl.exports
+
+WORKDIR /src
+RUN curl -L ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz | tar xz
+WORKDIR /src/uuid-1.6.2
+RUN CFLAGS="${EMCC_COMMON_FLAGS}" CXXFLAGS="${EMCC_COMMON_FLAGS}" emconfigure ./configure --build=aarch64-unknown-linux-gnu --enable-shared=no --enable-static=yes --with-perl=no --with-perl-compat=no --prefix=/install/libs --with-php=no --with-pic=yes
+RUN emmake make -j && emmake make install || true # install tries to strip the wasm, but it doesnt recognize the format, so ignore atm
+WORKDIR /install/libs/lib
+RUN ln -s libuuid.a libossp-uuid.a # contrib extensions use -lossp-uuid
+RUN ${LLVM_NM} /install/libs/lib/libossp-uuid.a | awk '$2 ~ /^[TDB]$/ {print $3}' | sed '/^$/d' | sort -u > /install/exports/libossp-uuid.exports
+
+ARG TARGETARCH
+FROM emscripten/emsdk:${EMSDK_VER} AS base-amd64
+FROM emscripten/emsdk:${EMSDK_VER}-arm64 AS base-arm64
+FROM base-${TARGETARCH} AS runner
+
+RUN apt update && apt upgrade -y && apt install -y \
+    xz-utils autoconf libtool automake pkgconf bison flex
+
+# this is where the libraries will be installed and subsequently where the LIBS and INCLUDES can be found
+ARG INSTALL_PREFIX=/install/libs
+ENV INSTALL_PREFIX=${INSTALL_PREFIX}
+
+ARG LIB_EXPORTS_DIR=/install/exports
+ENV LIB_EXPORTS_DIR=${LIB_EXPORTS_DIR}
+
+COPY --from=builder /install/libs ${INSTALL_PREFIX}
+COPY --from=builder /install/exports ${LIB_EXPORTS_DIR}
+
+# needed in building pglite.wasm
+ENV LLVM_NM=/emsdk/upstream/bin/llvm-nm
\ No newline at end of file
diff --git a/pglite-wasm/excluded.pglite.imports b/pglite-wasm/excluded.pglite.imports
new file mode 100644
index 0000000000000..e0d801f2348b5
--- /dev/null
+++ b/pglite-wasm/excluded.pglite.imports
@@ -0,0 +1,32 @@
+__indirect_function_table
+invoke_di
+invoke_didi
+invoke_dii
+invoke_i
+invoke_ii
+invoke_iii
+invoke_iiii
+invoke_iiiii
+invoke_iiiiii
+invoke_iiiiiii
+invoke_iiiiiiii
+invoke_iij
+invoke_ij
+invoke_ijj
+invoke_j
+invoke_ji
+invoke_jiiiii
+invoke_v
+invoke_vi
+invoke_vii
+invoke_viii
+invoke_viiidi
+invoke_viiii
+invoke_viiiii
+invoke_viiiiii
+invoke_viiiiii
+invoke_viiiiiiii
+invoke_viiiiiiiii
+invoke_viiji
+invoke_vij
+invoke_vijiiidjiiii
diff --git a/pglite-wasm/included.pglite.imports b/pglite-wasm/included.pglite.imports
new file mode 100644
index 0000000000000..63cbc5e039b90
--- /dev/null
+++ b/pglite-wasm/included.pglite.imports
@@ -0,0 +1,38 @@
+close
+fcntl
+free
+get_buffer_addr
+get_buffer_size
+get_channel
+getpid
+gettimeofday
+gmtime
+interactive_one
+interactive_read
+interactive_write
+ioctl
+isalnum
+isxdigit
+lowerstr
+main
+malloc
+memcmp
+memcpy
+memset
+nanosleep
+open
+pgl_backend
+pgl_initdb
+pgl_shutdown
+rand
+read
+readstoplist
+realloc
+searchstoplist
+socket
+srand
+strcmp
+strftime
+strlen
+strtoul
+use_wire
\ No newline at end of file
diff --git a/pglite-wasm/pg_main.c b/pglite-wasm/pg_main.c
index 07c21cf1b5b24..a3b77ece6cae6 100644
--- a/pglite-wasm/pg_main.c
+++ b/pglite-wasm/pg_main.c
@@ -26,6 +26,10 @@
 #include <unistd.h>             /* chdir */
 #include <sys/stat.h>           /* mkdir */
 
+#if defined(__EMSCRIPTEN__)
+#include <emscripten.h>
+#endif
+
 // globals
 
 
@@ -482,7 +486,8 @@ __attribute__ ((export_name("pgl_backend")))
 #else
         remove(IDB_PIPE_BOOT);
 #endif
-        stdin = fdopen(saved_stdin, "r");
+        // tdrz: I've commented this out!!!
+        // stdin = fdopen(saved_stdin, "r");
 
         PDEBUG("# 479: initdb faking shutdown to complete WAL/OID states");
         pg_proc_exit(66);
diff --git a/pglite/Makefile b/pglite/Makefile
new file mode 100644
index 0000000000000..4f4ef50406dd8
--- /dev/null
+++ b/pglite/Makefile
@@ -0,0 +1,35 @@
+# Packages other extensions into individual tar.gz archives
+
+top_builddir = ..
+include $(top_builddir)/src/Makefile.global
+
+SUBDIRS = \
+		pg_ivm \
+		vector
+
+prefix ?= /install/pglite
+EXTENSIONS_BUILD_ROOT := /tmp/extensions/build
+ARCHIVE_DIR := /install/pglite/extensions
+
+EXTENSIONS := $(SUBDIRS)
+
+# Default target: build tarballs for all contribs
+dist: $(addsuffix .tar.gz,$(EXTENSIONS))
+
+# Pattern rule: build $(EXT).tar.gz for each extra extension
+%.tar.gz:
+	@echo "=== Staging $* ==="
+	rm -rf $(EXTENSIONS_BUILD_ROOT)/$*
+	bash -c 'mkdir -p $(EXTENSIONS_BUILD_ROOT)/$*/$(prefix)/{bin,lib,share/extension,share/doc,share/postgresql/extension,share/postgresql/tsearch_data,include}'
+	$(MAKE) -C $* install DESTDIR=$(EXTENSIONS_BUILD_ROOT)/$*
+	@echo "=== Packaging $* ==="
+	mkdir -p $(ARCHIVE_DIR)
+	cd $(EXTENSIONS_BUILD_ROOT)/$*/$(prefix) && \
+	files=$$(find . -type f -o -type l | sed 's|^\./||') && \
+	tar -czf $(ARCHIVE_DIR)/$*.tar.gz $$files
+# 	tar -C $(EXTENSIONS_BUILD_ROOT)/$*/$(prefix) -czf $(ARCHIVE_DIR)/$*.tar.gz .
+
+.PHONY: dist
+
+
+$(recurse)
\ No newline at end of file
diff --git a/pglite/pg_ivm b/pglite/pg_ivm
new file mode 160000
index 0000000000000..f4b40e93a6047
--- /dev/null
+++ b/pglite/pg_ivm
@@ -0,0 +1 @@
+Subproject commit f4b40e93a60478a1ea9d69f0fd305452e5c00690
diff --git a/pglite/vector b/pglite/vector
new file mode 160000
index 0000000000000..2627c5ff775ae
--- /dev/null
+++ b/pglite/vector
@@ -0,0 +1 @@
+Subproject commit 2627c5ff775ae6d7aef0c430121ccf857842d2f2
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index aed880df4b876..befb131d977c4 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -225,13 +225,14 @@ ifeq ($(SHLIB_EXPORTS),)
 endif
 
 ifeq ($(PORTNAME), emscripten)
-  LINK.shared       = emsdk-shared
+  LINK.shared       = $(COMPILER) -shared -sSIDE_MODULE=1 -Wno-unused-function
   ifdef soname
     # emscripten uses unversioned shared libraries
     shlib     = $(shlib_bare)
     soname        = $(shlib_bare)
   endif
-  BUILD.exports     = ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
+  BUILD.exports     = ( $(AWK) '/^[^\#]/ {printf "%s\n",$$1}' $< ) | sort -u >$@
+#  BUILD.exports     = ( echo '{ global:'; $(AWK) '/^[^\#]/ {printf "%s;\n",$$1}' $<; echo ' local: *; };' ) >$@
   exports_file      = $(SHLIB_EXPORTS:%.txt=%.list)
 #  ifneq (,$(exports_file))
 #    LINK.shared     += -Wl,--version-script=$(exports_file)
diff --git a/src/backend/Makefile b/src/backend/Makefile
index dbc1d4a148f3a..a79301f587fc3 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -77,14 +77,55 @@ ifeq ($(PORTNAME), emscripten)
 AR ?= llvm-ar
 LIBPGCORE ?= $(top_builddir)/libpgcore.a
 LIBPG = $(top_builddir)/libpostgres.a
+LIBPGMAIN = $(top_builddir)/libpgmain.a
 PGCORE = $(top_builddir)/src/common/libpgcommon_srv.a $(top_builddir)/src/port/libpgport_srv.a $(LIBPG)
 PGMAIN = main/main.o tcop/postgres.o
+PGLITE_MAIN = pglite-wasm/pg_main.c
+EXPORTED_RUNTIME_METHODS="MEMFS,IDBFS,FS,setValue,getValue,UTF8ToString,stringToNewUTF8,stringToUTF8OnStack"
+PGROOT=/install/pglite
+PGPRELOAD=--preload-file ${PGROOT}/share/postgresql@/tmp/pglite/share/postgresql --preload-file ${PGROOT}/lib/postgresql@/tmp/pglite/lib/postgresql --preload-file $(top_builddir)/other/password@/tmp/pglite/password --preload-file $(top_builddir)/other/PGPASSFILE@/home/web_user/.pgpass --preload-file $(top_builddir)/other/empty@/tmp/pglite/bin/postgres --preload-file $(top_builddir)/other/empty@/tmp/pglite/bin/initdb
 postgres: $(OBJS)
-	$(AR) rcs $(top_builddir)/libpgmain.a $(PGMAIN)
+	$(AR) rcs $(LIBPGMAIN) $(PGMAIN)
 	$(AR) rcs $(LIBPG) $(filter-out $(PGMAIN),$(call expand_subsys,$(ONLYOBJS)))
 	$(CC) -r -o $(top_builddir)/libpgcore.o -Wl,--whole-archive $(PGCORE)
 	$(AR) rcs $(LIBPGCORE) $(top_builddir)/libpgcore.o
-	COPTS="$(LOPTS)" $(CC) $(MAIN_MODULE) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBPGCORE) $(top_builddir)/libpgmain.a $(LIBS)
+	COPTS="$(LOPTS)" $(CC) $(MAIN_MODULE) $(CFLAGS) $(LDFLAGS) -o $@$(X) $(LIBPGCORE) $(LIBPGMAIN) $(LIBS)
+
+# Extensions use functions from the core PG. These need to be exported by the emscripten compiler.
+# The following target gathers all extension imports + the default ones (included.pglite.imports),
+# excludes the one in excluded.pglite.imports and adds a leading _ to each.
+pglite-exported-functions:
+	$(MKDIR_P) '$(emscripten_imports_dir)'
+	cat $(top_builddir)/pglite-wasm/excluded.*.imports $(top_builddir)/src/interfaces/libpq/exports.list $(LIB_EXPORTS_DIR)/libossp-uuid.exports | sort -u > '$(top_builddir)/pglite-wasm/excluded.imports'
+	cat $(DESTDIR)$(emscripten_extension_imports_dir)/*.imports '$(top_builddir)/pglite-wasm/included.pglite.imports' | \
+	sort -u | \
+	grep -Fvx -f '$(top_builddir)/pglite-wasm/excluded.imports' | \
+	sed 's/^/_/' \
+	> '$(emscripten_imports_dir)/exported_functions.txt'
+
+# -sDYLINK_DEBUG=2 use this for debugging missing exported symbols (ex when an extension calls a pgcore function that hasn't been exported)
+# PGLITE_CFLAGS is something like "-O2" (aka release version) or "-g -gsource-map --no-wasm-opt" (aka debug version)
+pglite: pglite-exported-functions
+	$(CC) $(CFLAGS) $(LDFLAGS) -DPG_PREFIX=/tmp/pglite -DCMA_MB=12 -I$(top_builddir)/src/include -I$(top_builddir)/src/ -I$(top_builddir)/src/interfaces/libpq -o pglite.o -c $(top_builddir)/$(PGLITE_MAIN) -Wno-incompatible-pointer-types-discards-qualifiers
+	$(CC) \
+	$(PGLITE_CFLAGS) \
+	-fPIC -sWASM_BIGINT -sMIN_SAFARI_VERSION=150000 -D__PYDK__=1 -m32 -D_FILE_OFFSET_BITS=64 -sSUPPORT_LONGJMP=emscripten -mno-bulk-memory -mnontrapping-fptoint -mno-reference-types -mno-sign-ext -mno-extended-const -mno-atomics -mno-tail-call -mno-multivalue -mno-relaxed-simd -mno-simd128 -mno-multimemory -mno-exception-handling -Wno-unused-command-line-argument -Wno-unreachable-code-fallthrough -Wno-unused-function -Wno-invalid-noreturn -Wno-declaration-after-statement -Wno-invalid-noreturn \
+	-DPYDK=1 -DPG_PREFIX=/tmp/pglite -DCMA_MB=12 -o pglite.html --shell-file $(top_builddir)/pglite-wasm/repl.html \
+        $(PGPRELOAD) \
+        -sGLOBAL_BASE=12MB -ferror-limit=1 \
+        -sFORCE_FILESYSTEM=1 -sNO_EXIT_RUNTIME=1 -sENVIRONMENT=node,web,worker \
+        -sMAIN_MODULE=2 \
+		-sEXPORTED_FUNCTIONS=@$(emscripten_imports_dir)/exported_functions.txt \
+        -sMODULARIZE=1 -sEXPORT_ES6=1 -sEXPORT_NAME=Module \
+        -sALLOW_TABLE_GROWTH -sALLOW_MEMORY_GROWTH -sERROR_ON_UNDEFINED_SYMBOLS=0 \
+        -sEXPORTED_RUNTIME_METHODS=$(EXPORTED_RUNTIME_METHODS) \
+        -I./src/include -I./src/ -I./src/interfaces/libpq \
+        -L/install/libs/lib -L$(top_builddir) -L$(top_builddir)/src/interfaces/libpq/ \
+        pglite.o \
+		-Ldict_snowball \
+		-lxslt \
+        -lpgcore \
+        -lnodefs.js -lidbfs.js -lxml2 -lz
 endif
 
 ifeq ($(PORTNAME), wasi)
@@ -214,6 +255,11 @@ ifeq ($(PORTNAME), win32)
 ifeq ($(MAKE_DLL), true)
 	$(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
 endif
+endif
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_DATA) $(LIBPG) '$(DESTDIR)$(libdir)/libpostgres.a'
+	$(INSTALL_DATA) $(LIBPGCORE) '$(DESTDIR)$(libdir)/libpgcore.a'
+	$(INSTALL_DATA) $(LIBPGMAIN) '$(DESTDIR)$(libdir)/libpgmain.a'
 endif
 	$(MAKE) -C catalog install-data
 	$(MAKE) -C tsearch install-data
@@ -235,6 +281,9 @@ ifeq ($(MAKE_EXPORTS), true)
 	$(INSTALL_DATA) $(POSTGRES_IMP) '$(DESTDIR)$(pkglibdir)/$(POSTGRES_IMP)'
 	$(INSTALL_PROGRAM) $(MKLDEXPORT) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)/mkldexport.sh'
 endif
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) postgres.wasm '$(DESTDIR)$(bindir)/postgres.wasm'
+endif
 
 .PHONY: install-bin
 
@@ -255,6 +304,16 @@ ifeq ($(MAKE_EXPORTS), true)
 	$(MKDIR_P) '$(DESTDIR)$(pgxsdir)/$(MKLDEXPORT_DIR)'
 endif
 
+ifeq ($(PORTNAME), emscripten)
+install-pglite: pglite
+	$(INSTALL_PROGRAM) pglite.html '$(DESTDIR)$(bindir)/pglite.html'
+	$(INSTALL_PROGRAM) pglite.wasm '$(DESTDIR)$(bindir)/pglite.wasm'
+	$(INSTALL_PROGRAM) pglite.js '$(DESTDIR)$(bindir)/pglite.js'
+	$(INSTALL_PROGRAM) pglite.data '$(DESTDIR)$(bindir)/pglite.data'
+endif
+
+.PHONY: install-pglite
+
 
 ##########################################################################
 
@@ -273,6 +332,16 @@ ifeq ($(PORTNAME), win32)
 ifeq ($(MAKE_DLL), true)
 	rm -f '$(DESTDIR)$(libdir)/libpostgres.a'
 endif
+endif
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(libdir)/libpostgres.a'
+	rm -f '$(DESTDIR)$(libdir)/libpgcore.a'
+	rm -f '$(DESTDIR)$(libdir)/libpgmain.a'
+	rm -f '$(DESTDIR)$(bindir)/postgres.wasm'
+	rm -f '$(DESTDIR)$(bindir)/pglite.wasm'
+	rm -f '$(DESTDIR)$(bindir)/pglite.html'
+	rm -f '$(DESTDIR)$(bindir)/pglite.js'
+	rm -f '$(DESTDIR)$(bindir)/pglite.data'
 endif
 	$(MAKE) -C catalog uninstall-data
 	$(MAKE) -C tsearch uninstall-data
@@ -295,6 +364,12 @@ endif
 ifeq ($(PORTNAME), win32)
 	rm -f postgres.dll libpostgres.a $(WIN32RES)
 endif
+ifeq ($(PORTNAME), emscripten)
+	rm -f postgres.wasm libpostgres.a libpgcore.a libpgmain.a pglite.o pglite.html pglite.js pglite.wasm pglite.data
+endif
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(emscripten_imports_dir)/exported_functions.txt'
+endif
 
 distclean: clean
 # generated by configure
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index ff5277a682852..47fc44bf618e5 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -80,6 +80,10 @@
 #include "utils/guc_hooks.h"
 #include "utils/memutils.h"
 
+#if defined(__EMSCRIPTEN__)
+#include <emscripten/emscripten.h>
+#endif
+
 /*
  * Cope with the various platform-specific ways to spell TCP keepalive socket
  * options.  This doesn't cover Windows, which as usual does its own thing.
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index 031cc77c9d61b..a960ce6580188 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -47,16 +47,25 @@ localtime.c: % : $(top_srcdir)/src/timezone/%
 
 install: all installdirs
 	$(INSTALL_PROGRAM) initdb$(X) '$(DESTDIR)$(bindir)/initdb$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) initdb.wasm '$(DESTDIR)$(bindir)/initdb.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/initdb$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/initdb.wasm'
+endif
 
 clean distclean:
 	rm -f initdb$(X) $(OBJS) localtime.c
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f initdb.wasm
+endif
 
 # ensure that changes in datadir propagate into object file
 initdb.o: initdb.c $(top_builddir)/src/Makefile.global
diff --git a/src/bin/pg_amcheck/Makefile b/src/bin/pg_amcheck/Makefile
index f9488c447a887..765032692b22a 100644
--- a/src/bin/pg_amcheck/Makefile
+++ b/src/bin/pg_amcheck/Makefile
@@ -33,16 +33,25 @@ pg_amcheck: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_amcheck$(X) '$(DESTDIR)$(bindir)/pg_amcheck$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_amcheck.wasm '$(DESTDIR)$(bindir)/pg_amcheck.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_amcheck$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_amcheck.wasm'
+endif
 
 clean distclean:
 	rm -f pg_amcheck$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_amcheck.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_archivecleanup/Makefile b/src/bin/pg_archivecleanup/Makefile
index 93fd703f22591..aaeac7ffd3524 100644
--- a/src/bin/pg_archivecleanup/Makefile
+++ b/src/bin/pg_archivecleanup/Makefile
@@ -18,16 +18,25 @@ pg_archivecleanup: $(OBJS) | submake-libpgport
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_archivecleanup$(X) '$(DESTDIR)$(bindir)/pg_archivecleanup$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_archivecleanup.wasm '$(DESTDIR)$(bindir)/pg_archivecleanup.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_archivecleanup$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_archivecleanup.wasm'
+endif
 
 clean distclean:
 	rm -f pg_archivecleanup$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_archivecleanup.wasm
+endif	
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile
index 26c53e473f560..9b5df3ca2ecd3 100644
--- a/src/bin/pg_basebackup/Makefile
+++ b/src/bin/pg_basebackup/Makefile
@@ -63,6 +63,12 @@ install: all installdirs
 	$(INSTALL_PROGRAM) pg_createsubscriber$(X) '$(DESTDIR)$(bindir)/pg_createsubscriber$(X)'
 	$(INSTALL_PROGRAM) pg_receivewal$(X) '$(DESTDIR)$(bindir)/pg_receivewal$(X)'
 	$(INSTALL_PROGRAM) pg_recvlogical$(X) '$(DESTDIR)$(bindir)/pg_recvlogical$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_basebackup.wasm '$(DESTDIR)$(bindir)/pg_basebackup.wasm'
+	$(INSTALL_PROGRAM) pg_createsubscriber.wasm '$(DESTDIR)$(bindir)/pg_createsubscriber.wasm'
+	$(INSTALL_PROGRAM) pg_receivewal.wasm '$(DESTDIR)$(bindir)/pg_receivewal.wasm'
+	$(INSTALL_PROGRAM) pg_recvlogical.wasm '$(DESTDIR)$(bindir)/pg_recvlogical.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
@@ -72,12 +78,21 @@ uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_createsubscriber$(X)'
 	rm -f '$(DESTDIR)$(bindir)/pg_receivewal$(X)'
 	rm -f '$(DESTDIR)$(bindir)/pg_recvlogical$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_basebackup.wasm'
+	rm -f '$(DESTDIR)$(bindir)/pg_createsubscriber.wasm'
+	rm -f '$(DESTDIR)$(bindir)/pg_receivewal.wasm'
+	rm -f '$(DESTDIR)$(bindir)/pg_recvlogical.wasm'
+endif
 
 clean distclean:
 	rm -f pg_basebackup$(X) pg_createsubscriber$(X) pg_receivewal$(X) pg_recvlogical$(X) \
 		$(BBOBJS) pg_createsubscriber.o pg_receivewal.o pg_recvlogical.o \
 		$(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_basebackup.wasm pg_createsubscriber.wasm pg_receivewal.wasm pg_recvlogical.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_checksums/Makefile b/src/bin/pg_checksums/Makefile
index 31de5fb467344..f524f483fe2a7 100644
--- a/src/bin/pg_checksums/Makefile
+++ b/src/bin/pg_checksums/Makefile
@@ -29,16 +29,25 @@ pg_checksums: $(OBJS) | submake-libpgport
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_checksums$(X) '$(DESTDIR)$(bindir)/pg_checksums$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_checksums.wasm '$(DESTDIR)$(bindir)/pg_checksums.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_checksums$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_checksums.wasm'
+endif
 
 clean distclean:
 	rm -f pg_checksums$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_checksums.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_combinebackup/Makefile b/src/bin/pg_combinebackup/Makefile
index c3729755ba4ba..167ec4be960f0 100644
--- a/src/bin/pg_combinebackup/Makefile
+++ b/src/bin/pg_combinebackup/Makefile
@@ -35,16 +35,25 @@ pg_combinebackup: $(OBJS) | submake-libpgport submake-libpgfeutils
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_combinebackup$(X) '$(DESTDIR)$(bindir)/pg_combinebackup$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_combinebackup.wasm '$(DESTDIR)$(bindir)/pg_combinebackup.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_combinebackup$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_combinebackup.wasm'
+endif
 
 clean distclean maintainer-clean:
 	rm -f pg_combinebackup$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_combinebackup.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index c54f68c9daddd..3d3c44fa2b4b8 100644
--- a/src/bin/pg_config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -19,23 +19,50 @@ OBJS = \
 	$(WIN32RES) \
 	pg_config.o
 
+all:
+ifeq ($(PORTNAME), emscripten)
+all: pg_config pg_config_sh
+else 
 all: pg_config
+endif
 
 pg_config: $(OBJS) | submake-libpgport
 	$(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
 
+# the emscripten build generates multiple "runnable" files (.cjs/.mjs + .wasm)
+# but other postgres tools expect exacly 'pg_config' as an executable 
+# the following rule creates a node script that calls the pg_config.cjs/.mjs
+# pg_config.wasm is implicitly expected to be in the same folder
+pg_config_sh: pg_config
+	echo "#!/usr/bin/env node" > pg_config
+	echo 'require("./pg_config$(X)")' >> pg_config
+	chmod +x pg_config
+
 install: all installdirs
 	$(INSTALL_SCRIPT) pg_config$(X) '$(DESTDIR)$(bindir)/pg_config$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_config.wasm '$(DESTDIR)$(bindir)/pg_config.wasm'
+	$(INSTALL_PROGRAM) pg_config '$(DESTDIR)$(bindir)/pg_config'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_config$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_config.wasm'
+	rm -f '$(DESTDIR)$(bindir)/pg_config'
+endif
+
 
 clean distclean:
 	rm -f pg_config$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_config.wasm
+	rm -f pg_config
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
index c3f64e189690a..0be4e65656b07 100644
--- a/src/bin/pg_controldata/Makefile
+++ b/src/bin/pg_controldata/Makefile
@@ -26,16 +26,25 @@ pg_controldata: $(OBJS) | submake-libpgport
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_controldata$(X) '$(DESTDIR)$(bindir)/pg_controldata$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_controldata.wasm '$(DESTDIR)$(bindir)/pg_controldata.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_controldata$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_controldata.wasm'
+endif
 
 clean distclean:
 	rm -f pg_controldata$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_controldata.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
index a3fbad7a3a5a5..514cd8cf032f9 100644
--- a/src/bin/pg_ctl/Makefile
+++ b/src/bin/pg_ctl/Makefile
@@ -35,16 +35,25 @@ pg_ctl: $(OBJS) | submake-libpgport $(SUBMAKE_LIBPQ)
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_ctl$(X) '$(DESTDIR)$(bindir)/pg_ctl$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_ctl.wasm '$(DESTDIR)$(bindir)/pg_ctl.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_ctl$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_ctl.wasm'
+endif
 
 clean distclean:
 	rm -f pg_ctl$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_ctl.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 930c741c95d85..cdd9cfcc5de96 100644
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -57,6 +57,11 @@ install: all installdirs
 	$(INSTALL_PROGRAM) pg_dump$(X) '$(DESTDIR)$(bindir)'/pg_dump$(X)
 	$(INSTALL_PROGRAM) pg_restore$(X) '$(DESTDIR)$(bindir)'/pg_restore$(X)
 	$(INSTALL_PROGRAM) pg_dumpall$(X) '$(DESTDIR)$(bindir)'/pg_dumpall$(X)
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_dump.wasm '$(DESTDIR)$(bindir)/pg_dump.wasm'
+	$(INSTALL_PROGRAM) pg_restore.wasm '$(DESTDIR)$(bindir)/pg_restore.wasm'
+	$(INSTALL_PROGRAM) pg_dumpall.wasm '$(DESTDIR)$(bindir)/pg_dumpall.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
@@ -69,7 +74,13 @@ installcheck:
 
 uninstall:
 	rm -f $(addprefix '$(DESTDIR)$(bindir)'/, pg_dump$(X) pg_restore$(X) pg_dumpall$(X))
+ifeq ($(PORTNAME), emscripten)
+	rm -f $(addprefix '$(DESTDIR)$(bindir)'/, pg_dump.wasm pg_restore.wasm pg_dumpall.wasm)
+endif
 
 clean distclean:
 	rm -f pg_dump$(X) pg_restore$(X) pg_dumpall$(X) $(OBJS) pg_dump.o common.o pg_dump_sort.o pg_restore.o pg_dumpall.o
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_dump.wasm pg_restore.wasm pg_dumpall.wasm
+endif
\ No newline at end of file
diff --git a/src/bin/pg_resetwal/Makefile b/src/bin/pg_resetwal/Makefile
index 4228a5a772a9f..ff8e5d642a1f6 100644
--- a/src/bin/pg_resetwal/Makefile
+++ b/src/bin/pg_resetwal/Makefile
@@ -28,16 +28,25 @@ pg_resetwal: $(OBJS) | submake-libpgport
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_resetwal$(X) '$(DESTDIR)$(bindir)/pg_resetwal$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_resetwal.wasm '$(DESTDIR)$(bindir)/pg_resetwal.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_resetwal$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_resetwal.wasm'
+endif
 
 clean distclean:
 	rm -f pg_resetwal$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_resetwal.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_rewind/Makefile b/src/bin/pg_rewind/Makefile
index 12b138b2f2ce3..e0a5f5dd2c38f 100644
--- a/src/bin/pg_rewind/Makefile
+++ b/src/bin/pg_rewind/Makefile
@@ -42,16 +42,25 @@ xlogreader.c: % : $(top_srcdir)/src/backend/access/transam/%
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_rewind$(X) '$(DESTDIR)$(bindir)/pg_rewind$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_rewind.wasm '$(DESTDIR)$(bindir)/pg_rewind.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_rewind$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_rewind.wasm'
+endif
 
 clean distclean:
 	rm -f pg_rewind$(X) $(OBJS) xlogreader.c
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_rewind.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_test_fsync/Makefile b/src/bin/pg_test_fsync/Makefile
index 4c5e518125033..e3bb3527a8858 100644
--- a/src/bin/pg_test_fsync/Makefile
+++ b/src/bin/pg_test_fsync/Makefile
@@ -18,6 +18,9 @@ pg_test_fsync: $(OBJS) | submake-libpgport
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_test_fsync$(X) '$(DESTDIR)$(bindir)/pg_test_fsync$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_test_fsync.wasm '$(DESTDIR)$(bindir)/pg_test_fsync.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
@@ -30,7 +33,13 @@ installcheck:
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_test_fsync$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_test_fsync.wasm'
+endif
 
 clean distclean:
 	rm -f pg_test_fsync$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_test_fsync.wasm
+endif
\ No newline at end of file
diff --git a/src/bin/pg_test_timing/Makefile b/src/bin/pg_test_timing/Makefile
index 7f677edadb30f..eb4f95c2bf088 100644
--- a/src/bin/pg_test_timing/Makefile
+++ b/src/bin/pg_test_timing/Makefile
@@ -18,6 +18,9 @@ pg_test_timing: $(OBJS) | submake-libpgport
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_test_timing$(X) '$(DESTDIR)$(bindir)/pg_test_timing$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_test_timing.wasm '$(DESTDIR)$(bindir)/pg_test_timing.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
@@ -30,7 +33,13 @@ installcheck:
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_test_timing$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_test_timing.wasm'
+endif
 
 clean distclean:
 	rm -f pg_test_timing$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_test_timing.wasm
+endif	
\ No newline at end of file
diff --git a/src/bin/pg_upgrade/Makefile b/src/bin/pg_upgrade/Makefile
index bde91e2beb82c..faa309ac31691 100644
--- a/src/bin/pg_upgrade/Makefile
+++ b/src/bin/pg_upgrade/Makefile
@@ -42,17 +42,26 @@ pg_upgrade: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_upgrade$(X) '$(DESTDIR)$(bindir)/pg_upgrade$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_upgrade.wasm '$(DESTDIR)$(bindir)/pg_upgrade.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_upgrade$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_upgrade.wasm'
+endif
 
 clean distclean:
 	rm -f pg_upgrade$(X) $(OBJS)
 	rm -rf delete_old_cluster.sh log/ tmp_check/ \
 	       reindex_hash.sql
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_upgrade.wasm
+endif
 
 export with_icu
 
diff --git a/src/bin/pg_verifybackup/Makefile b/src/bin/pg_verifybackup/Makefile
index 7c045f142e8d7..e49278f32d28c 100644
--- a/src/bin/pg_verifybackup/Makefile
+++ b/src/bin/pg_verifybackup/Makefile
@@ -30,16 +30,25 @@ pg_verifybackup: $(OBJS) | submake-libpq submake-libpgport submake-libpgfeutils
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_verifybackup$(X) '$(DESTDIR)$(bindir)/pg_verifybackup$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_verifybackup.wasm '$(DESTDIR)$(bindir)/pg_verifybackup.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_verifybackup$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_verifybackup.wasm'
+endif
 
 clean distclean:
 	rm -f pg_verifybackup$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_verifybackup.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_waldump/Makefile b/src/bin/pg_waldump/Makefile
index 4c1ee649501f4..1f08027439af9 100644
--- a/src/bin/pg_waldump/Makefile
+++ b/src/bin/pg_waldump/Makefile
@@ -38,16 +38,25 @@ $(RMGRDESCSOURCES): % : $(top_srcdir)/src/backend/access/rmgrdesc/%
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_waldump$(X) '$(DESTDIR)$(bindir)/pg_waldump$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_waldump.wasm '$(DESTDIR)$(bindir)/pg_waldump.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_waldump$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_waldump.wasm'
+endif
 
 clean distclean:
 	rm -f pg_waldump$(X) $(OBJS) $(RMGRDESCSOURCES) xlogreader.c xlogstats.c
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_waldump.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pg_walsummary/Makefile b/src/bin/pg_walsummary/Makefile
index 1886c39e98b19..c686d9450641a 100644
--- a/src/bin/pg_walsummary/Makefile
+++ b/src/bin/pg_walsummary/Makefile
@@ -31,16 +31,25 @@ pg_walsummary: $(OBJS) | submake-libpgport submake-libpgfeutils
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pg_walsummary$(X) '$(DESTDIR)$(bindir)/pg_walsummary$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pg_walsummary.wasm '$(DESTDIR)$(bindir)/pg_walsummary.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pg_walsummary$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pg_walsummary.wasm'
+endif
 
 clean distclean maintainer-clean:
 	rm -f pg_walsummary$(X) $(OBJS)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f pg_walsummary.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/pgbench/Makefile b/src/bin/pgbench/Makefile
index 987bf64df9de0..604f9493b35af 100644
--- a/src/bin/pgbench/Makefile
+++ b/src/bin/pgbench/Makefile
@@ -40,17 +40,26 @@ exprparse.o exprscan.o: exprparse.h
 
 install: all installdirs
 	$(INSTALL_PROGRAM) pgbench$(X) '$(DESTDIR)$(bindir)/pgbench$(X)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) pgbench.wasm '$(DESTDIR)$(bindir)/pgbench.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/pgbench$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/pgbench.wasm'
+endif
 
 clean distclean:
 	rm -f pgbench$(X) $(OBJS)
 	rm -rf tmp_check
 	rm -f exprparse.h exprparse.c exprscan.c
+ifeq ($(PORTNAME), emscripten)
+	rm -f pgbench.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index 374c4c3ab8f83..9c17566be2f2f 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -65,17 +65,26 @@ psqlscanslash.c: FLEX_FIX_WARNING=yes
 install: all installdirs
 	$(INSTALL_PROGRAM) psql$(X) '$(DESTDIR)$(bindir)/psql$(X)'
 	$(INSTALL_DATA) $(srcdir)/psqlrc.sample '$(DESTDIR)$(datadir)/psqlrc.sample'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) psql.wasm '$(DESTDIR)$(bindir)/psql.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)' '$(DESTDIR)$(datadir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/psql$(X)' '$(DESTDIR)$(datadir)/psqlrc.sample'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/psql.wasm'
+endif
 
 clean distclean:
 	rm -f psql$(X) $(OBJS) lex.backup
 	rm -rf tmp_check
 	rm -f sql_help.h sql_help.c psqlscanslash.c
+ifeq ($(PORTNAME), emscripten)
+	rm -f psql.wasm
+endif
 
 check:
 	$(prove_check)
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index 9633c99136880..f155e24f0c395 100644
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -41,17 +41,33 @@ install: all installdirs
 	$(INSTALL_PROGRAM) vacuumdb$(X)   '$(DESTDIR)$(bindir)'/vacuumdb$(X)
 	$(INSTALL_PROGRAM) reindexdb$(X)  '$(DESTDIR)$(bindir)'/reindexdb$(X)
 	$(INSTALL_PROGRAM) pg_isready$(X) '$(DESTDIR)$(bindir)'/pg_isready$(X)
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) createdb.wasm   '$(DESTDIR)$(bindir)'/createdb.wasm
+	$(INSTALL_PROGRAM) dropdb.wasm     '$(DESTDIR)$(bindir)'/dropdb.wasm
+	$(INSTALL_PROGRAM) createuser.wasm '$(DESTDIR)$(bindir)'/createuser.wasm
+	$(INSTALL_PROGRAM) dropuser.wasm   '$(DESTDIR)$(bindir)'/dropuser.wasm
+	$(INSTALL_PROGRAM) clusterdb.wasm  '$(DESTDIR)$(bindir)'/clusterdb.wasm
+	$(INSTALL_PROGRAM) vacuumdb.wasm   '$(DESTDIR)$(bindir)'/vacuumdb.wasm
+	$(INSTALL_PROGRAM) reindexdb.wasm  '$(DESTDIR)$(bindir)'/reindexdb.wasm
+	$(INSTALL_PROGRAM) pg_isready.wasm '$(DESTDIR)$(bindir)'/pg_isready.wasm
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(addsuffix $(X), $(PROGRAMS)))
+ifeq ($(PORTNAME), emscripten)
+	rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(addsuffix .wasm, $(PROGRAMS)))
+endif
 
 clean distclean:
 	rm -f $(addsuffix $(X), $(PROGRAMS)) $(addsuffix .o, $(PROGRAMS))
 	rm -f common.o $(WIN32RES)
 	rm -rf tmp_check
+ifeq ($(PORTNAME), emscripten)
+	rm -f $(addsuffix .wasm, $(PROGRAMS))
+endif
 
 export with_icu
 
diff --git a/src/include/port/emscripten.h b/src/include/port/emscripten.h
index db4903aa48f78..fb647c0d45199 100644
--- a/src/include/port/emscripten.h
+++ b/src/include/port/emscripten.h
@@ -4,10 +4,13 @@
 #define I_WASM
 
 #if !defined(__cplusplus)
-#include <sdk_port.h>
+// #include <sdk_port.h>
+// #include "/tmp/pglite/include/sdk_port.h"
+// #include <sdk_port.h>
 #endif
 
-#include "/tmp/pglite/include/wasm_common.h"
+// #include "/tmp/pglite/include/wasm_common.h"
+#include "port/wasm_common.h"
 
 
 #define BOOT_END_MARK "build indices"
diff --git a/src/include/port/pg_debug.h b/src/include/port/pg_debug.h
new file mode 100644
index 0000000000000..73da07ddb9747
--- /dev/null
+++ b/src/include/port/pg_debug.h
@@ -0,0 +1,8 @@
+#ifndef I_PGDEBUG
+#define I_PGDEBUG
+#define WASM_USERNAME "postgres"
+#define PDEBUG(string)
+#define JSDEBUG(string)
+#define ADEBUG(string)
+#define PGDEBUG 0
+#endif
diff --git a/src/include/port/sdk_port.h b/src/include/port/sdk_port.h
new file mode 100644
index 0000000000000..7e6b178dce493
--- /dev/null
+++ b/src/include/port/sdk_port.h
@@ -0,0 +1,262 @@
+#if defined(__EMSCRIPTEN__)
+#include <emscripten.h>
+
+#elif defined(__wasi__)
+
+
+#ifndef I_WASI
+#define I_WASI
+
+#undef HAVE_PTHREAD
+
+#if defined(HAVE_SETSID)
+#undef HAVE_SETSID
+#endif
+
+#if defined(HAVE_GETRLIMIT)
+#undef HAVE_GETRLIMIT
+#endif
+
+
+#define PLATFORM_DEFAULT_SYNC_METHOD    SYNC_METHOD_FDATASYNC
+
+#define EMSCRIPTEN_KEEPALIVE __attribute__((used))
+#define __declspec( dllimport ) __attribute__((used))
+
+#define em_callback_func void
+#define emscripten_set_main_loop(...)
+#define emscripten_force_exit(...)
+#define EM_JS(...)
+
+#include "wasm_common.h"
+
+
+static pid_t
+fork(void) {
+    puts("# 31: fork -1");
+    return -1;
+}
+
+// ======== signal ========================
+#define SA_RESTART 4
+#define SIG_SETMASK   2
+
+#define SIG_BLOCK     0
+#define SIG_UNBLOCK   1
+
+/* A signal handler.  */
+typedef void (*handler_t) (int signal);
+typedef unsigned char sigset_t;
+typedef void (*__sighandler_t) (int);
+
+struct sigaction {
+    __sighandler_t sa_handler;
+    unsigned long sa_flags;
+#ifdef SA_RESTORER
+    __sigrestore_t sa_restorer;
+#endif
+    sigset_t sa_mask;
+};
+extern int sigemptyset(sigset_t *set);
+extern int sigaction(int signum, const struct sigaction *act, struct sigaction *oldact);
+extern int sigdelset (sigset_t *set, int sig);
+extern int sigfillset (sigset_t *set);
+extern int sigprocmask (int operation, const sigset_t *set, sigset_t *old_set);
+extern int sigaddset (sigset_t *set, int sig);
+
+// STUBS
+extern int pthread_sigmask(int how, const sigset_t *set, sigset_t *oldset);
+extern int sigismember(const sigset_t *set, int signum);
+extern int sigpending(sigset_t *set);
+extern int sigwait(const sigset_t *restrict set, int *restrict sig);
+
+// ====================================================
+// unistd
+extern unsigned int alarm(unsigned int seconds);
+
+// ====================================================
+
+
+// WIP :
+
+#include <unistd.h>
+static uid_t
+getuid(void) {
+    return 1000;
+}
+
+static int
+dup(int fd) {
+    puts("# 128: dup");
+    return fd;
+}
+static int
+dup2(int old, int new) {
+    puts("# 140: dup2");
+    return -1;
+}
+static int
+pipe(int fd[2]) {
+    puts("# 145: pipe");
+    abort();
+    return -1;
+}
+
+#include <sys/resource.h>
+#define RLIMIT_NOFILE 7
+#define RLIMIT_STACK 3
+#define RLIM_INFINITY ((unsigned long int)(~0UL))
+
+struct rlimit {
+    unsigned long   rlim_cur;
+    unsigned long   rlim_max;
+};
+static int
+getrlimit(int resource, struct rlimit *rlim) {
+    return -1;
+}
+
+
+static const char *gai_strerror_msg = "# 165: gai_strerror_msg";
+static const char *
+gai_strerror(int errcode) {
+    return gai_strerror_msg;
+}
+
+
+
+
+// WIP: semaphores here
+// ==================================================================
+#include <sys/sem.h>
+
+static int
+semctl(int semid, int semnum, int cmd, ...) {
+    return 0; // -1;
+}
+
+static int
+semget(key_t key, int nsems, int semflg) {
+#if 0 // PGDEBUG
+    printf("# 213: semget(key_t key = %d, int nsems=%d, int semflg=%d)\n", key, nsems, semflg);
+#endif
+    return 1;
+}
+
+static int
+semop(int semid, struct sembuf *sops, size_t nsops) {
+    return 0;  // -1;
+}
+
+
+
+#include <sys/mman.h>
+#if defined(PYDK)
+extern int shm_open(const char *name, int oflag, mode_t mode);
+extern int shm_unlink(const char *name);
+#else
+static int
+shm_open(const char *name, int oflag, mode_t mode) {
+    char tmpnam[128];
+    int fd;
+    snprintf(tmpnam, 128, "/tmp%s", name);
+    fd=fileno(fopen(tmpnam, "w+"));
+    fprintf(stderr, "# 212: shm_open(%s) => %d\n", tmpnam, fd);
+    return fd;
+}
+
+static int
+shm_unlink(const char *name) {
+    char tmpnam[128];
+    snprintf(tmpnam, 128, "/tmp%s", name);
+    fprintf(stderr, "# 220: shm_unlink(%s) STUB\n", tmpnam);
+    return remove(tmpnam); // -1
+}
+
+#endif
+
+
+
+#define system(command) system_wasi(command)
+extern int system_wasi(const char *command);
+
+
+
+// time.h
+
+static void
+tzset(void) {
+    puts("# 241: tzset(void) STUB");
+}
+
+#if defined(PG_INITDB) || defined(FE_UTILS_PRINT) || defined(PG_DUMP_PARALLEL)
+static void
+__SIG_IGN(int param) {
+}
+#endif
+
+
+extern void sock_flush();
+
+
+// TODO: socket here
+// ==================================================================
+
+/*
+#include <sys/socket.h>
+
+extern ssize_t sdk_recv(int sockfd, void *buf, size_t len, int flags);
+extern ssize_t recvfrom(int socket, void *buffer, size_t length, int flags, void *address, socklen_t *address_len);
+
+extern ssize_t sdk_send(int sockfd, const void *buf, size_t len, int flags);
+extern ssize_t sendto(int sockfd, const void *buf, size_t len, int flags, void *dest_addr, socklen_t addrlen);
+
+#define recv(sockfd, buf, len, flags) sdk_recv(sockfd, buf, len, flags)
+
+
+
+
+static int
+listen(int sockfd, int backlog) {
+    return 0;
+}
+
+static struct group *_Nullable
+getgrnam(const char *_Nullable name) {
+    return NULL;
+}
+
+
+static int
+getaddrinfo(const char *restrict node,
+                   const char *restrict service,
+                   void *restrict hints,
+                   void **restrict res) {
+    puts("# 60: getaddrinfo");
+    return -1;
+}
+static void
+freeaddrinfo(void *res) {
+    puts("# 65: freeaddrinfo");
+}
+
+extern ssize_t recvfrom_bc(int socket, void *buffer, size_t length, int flags, void *address, socklen_t *address_len);
+
+*/
+
+
+//#define pthread_mutex_lock(mut) sdk_pthread_mutex_lock(mut)
+//extern int sdk_pthread_mutex_lock(void *mutex);
+
+/*
+       int pthread_mutex_lock(pthread_mutex_t *mutex);
+       int pthread_mutex_trylock(pthread_mutex_t *mutex);
+       int pthread_mutex_unlock(pthread_mutex_t *mutex);
+*/
+
+
+#endif // I_WASI
+
+#else
+    #error "unknown port mode should be __EMSCRIPTEN__ or __wasi__"
+#endif // __EMSCRIPTEN__
diff --git a/src/include/port/wasm_common.h b/src/include/port/wasm_common.h
index 6f53f0fc5bb92..d8ade8cc7523e 100644
--- a/src/include/port/wasm_common.h
+++ b/src/include/port/wasm_common.h
@@ -45,7 +45,7 @@
 #   define PG_PLUGIN_INCLUDE "/pgdata/pg_plugin.h"
 #endif
 
-#include "pg_debug.h"
+#include "port/pg_debug.h"
 
 // #define COPY_INTERNAL
 #define COPY_OFF
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 934b7cef1b0f5..ea5cbb1594caa 100644
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -83,14 +83,23 @@ keywords.o: $(top_srcdir)/src/include/parser/kwlist.h
 
 install: all installdirs
 	$(INSTALL_PROGRAM) ecpg$(X) '$(DESTDIR)$(bindir)'
+ifeq ($(PORTNAME), emscripten)
+	$(INSTALL_PROGRAM) ecpg.wasm '$(DESTDIR)$(bindir)/ecpg.wasm'
+endif
 
 installdirs:
 	$(MKDIR_P) '$(DESTDIR)$(bindir)'
 
 uninstall:
 	rm -f '$(DESTDIR)$(bindir)/ecpg$(X)'
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(bindir)/ecpg.wasm'
+endif
 
 clean distclean:
 	rm -f *.o ecpg$(X)
 	rm -f typename.c
 	rm -f preproc.y preproc.c preproc.h pgc.c c_kwlist_d.h ecpg_kwlist_d.h
+ifeq ($(PORTNAME), emscripten)
+	rm -f ecpg.wasm
+endif
\ No newline at end of file
diff --git a/src/makefiles/Makefile.emscripten b/src/makefiles/Makefile.emscripten
index 3d37d043ad8c4..72e4c10a9fba4 100644
--- a/src/makefiles/Makefile.emscripten
+++ b/src/makefiles/Makefile.emscripten
@@ -14,3 +14,9 @@ AROPT = crs
 # Rule for building a shared library from a single .o file
 %.so: %.o
 	$(CC) $(CFLAGS) $< $(LDFLAGS) $(LDFLAGS_SL) -shared -o $@
+
+emscripten_include_dir := $(pkgincludedir)/emscripten
+emscripten_base_dir := $(emscripten_include_dir)/base
+emscripten_imports_dir := $(emscripten_base_dir)/imports
+emscripten_extension_dir := $(emscripten_include_dir)/extension
+emscripten_extension_imports_dir := $(emscripten_extension_dir)/imports
\ No newline at end of file
diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 0de3737e789b4..bf4916166cba1 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -249,6 +249,12 @@ ifdef MODULES
 ifeq ($(with_llvm), yes)
 	$(foreach mod, $(MODULES), $(call install_llvm_module,$(mod),$(mod).bc))
 endif # with_llvm
+ifeq ($(PORTNAME), emscripten)
+	$(LLVM_NM) -u *.o    | awk '{print $$2}'              | sed '/^$$/d' | sort -u > undef.txt
+	$(LLVM_NM)    *.o    | awk '$$2 ~ /^[TDB]$$/ {print $$3}' | sed '/^$$/d' | sort -u > defs.txt
+	comm -23 undef.txt defs.txt > '$(emscripten_extension_imports_dir)/$(MODULES).imports'
+	rm -f undef.txt defs.txt
+endif # PORTNAME=emscripten
 endif # MODULES
 ifdef DOCS
 ifdef docdir
@@ -271,6 +277,12 @@ ifdef MODULE_big
 ifeq ($(with_llvm), yes)
 	$(call install_llvm_module,$(MODULE_big),$(OBJS))
 endif # with_llvm
+ifeq ($(PORTNAME), emscripten)
+	$(LLVM_NM) -u $(OBJS)    | awk '{print $$2}'              | sed '/^$$/d' | sort -u > undef.txt
+	$(LLVM_NM)    $(OBJS)    | awk '$$2 ~ /^[TDB]$$/ {print $$3}' | sed '/^$$/d' | sort -u > defs.txt
+	comm -23 undef.txt defs.txt > '$(emscripten_extension_imports_dir)/$(MODULE_big).imports'
+	rm -f undef.txt defs.txt
+endif # PORTNAME=emscripten
 
 install: install-lib
 endif # MODULE_big
@@ -302,6 +314,9 @@ ifdef MODULE_big
 installdirs: installdirs-lib
 endif # MODULE_big
 
+ifeq ($(PORTNAME), emscripten)
+	$(MKDIR_P) '$(DESTDIR)$(emscripten_extension_imports_dir)'
+endif
 
 uninstall:
 ifneq (,$(EXTENSION))
@@ -318,6 +333,9 @@ ifdef MODULES
 ifeq ($(with_llvm), yes)
 	$(foreach mod, $(MODULES), $(call uninstall_llvm_module,$(mod)))
 endif # with_llvm
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(emscripten_extension_imports_dir)/$(MODULES).imports'
+endif
 endif # MODULES
 ifdef DOCS
 	rm -f $(addprefix '$(DESTDIR)$(docdir)/$(docmoduledir)'/, $(DOCS))
@@ -340,6 +358,10 @@ ifeq ($(with_llvm), yes)
 	$(call uninstall_llvm_module,$(MODULE_big))
 endif # with_llvm
 
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(emscripten_extension_imports_dir)/$(MODULE_big).imports'
+endif
+
 uninstall: uninstall-lib
 endif # MODULE_big
 
diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile
index 63cb96fae3efc..7bdf2cd3f1e51 100644
--- a/src/pl/plpgsql/src/Makefile
+++ b/src/pl/plpgsql/src/Makefile
@@ -53,11 +53,20 @@ install: all install-lib install-data install-headers
 installdirs: installdirs-lib
 	$(MKDIR_P) '$(DESTDIR)$(datadir)/extension'
 	$(MKDIR_P) '$(DESTDIR)$(includedir_server)'
+ifeq ($(PORTNAME), emscripten)
+	$(MKDIR_P) '$(DESTDIR)$(emscripten_extension_imports_dir)'
+endif
 
 uninstall: uninstall-lib uninstall-data uninstall-headers
 
 install-data: installdirs
 	$(INSTALL_DATA) $(addprefix $(srcdir)/, $(DATA)) '$(DESTDIR)$(datadir)/extension/'
+ifeq ($(PORTNAME), emscripten)
+	$(LLVM_NM) -u $(OBJS)    | awk '{print $$2}'              | sed '/^$$/d' | sort -u > undef.txt
+	$(LLVM_NM)    $(OBJS)    | awk '$$2 ~ /^[TDB]$$/ {print $$3}' | sed '/^$$/d' | sort -u > defs.txt
+	comm -23 undef.txt defs.txt > '$(DESTDIR)$(emscripten_extension_imports_dir)/$(NAME).imports'
+	rm -f undef.txt defs.txt
+endif
 
 # The plpgsql.h header file is needed by instrumentation plugins
 install-headers: installdirs
@@ -65,6 +74,9 @@ install-headers: installdirs
 
 uninstall-data:
 	rm -f $(addprefix '$(DESTDIR)$(datadir)/extension'/, $(notdir $(DATA)))
+ifeq ($(PORTNAME), emscripten)
+	rm -f '$(DESTDIR)$(emscripten_extension_imports_dir)/$(NAME).imports'
+endif
 
 uninstall-headers:
 	rm -f '$(DESTDIR)$(includedir_server)/plpgsql.h'
diff --git a/src/test/Makefile b/src/test/Makefile
index dbd3192874d33..03bb5ccd34dfe 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -7,6 +7,12 @@
 # src/test/Makefile
 #
 #-------------------------------------------------------------------------
+ifeq ($(PORTNAME), emscripten)
+# edited for pglite
+all: $(echo src/test and src/test/isolation skipped)
+clean check installcheck all-src-recurse: all
+install: all
+else
 
 subdir = src/test
 top_builddir = ../..
@@ -49,3 +55,5 @@ $(call recurse,installcheck, $(installable_dirs))
 $(call recurse,install, $(installable_dirs))
 
 $(recurse_always)
+
+endif
\ No newline at end of file
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
index ade2256ed3aa7..e0094bcb662ff 100644
--- a/src/test/isolation/Makefile
+++ b/src/test/isolation/Makefile
@@ -1,6 +1,12 @@
 #
 # Makefile for isolation tests
 #
+ifeq ($(PORTNAME), emscripten)
+# edited for pglite
+all: $(echo src/test and src/test/isolation skipped)
+clean check installcheck all-src-recurse: all
+install: all
+else
 
 PGFILEDESC = "pg_isolation_regress/isolationtester - multi-client test driver"
 PGAPPICON = win32
@@ -72,3 +78,5 @@ installcheck-prepared-txns: all temp-install
 
 check-prepared-txns: all temp-install
 	$(pg_isolation_regress_check) --schedule=$(srcdir)/isolation_schedule prepared-transactions prepared-transactions-cic
+
+endif
\ No newline at end of file
diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index c85e831247a5a..d871b67582378 100644
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -48,8 +48,12 @@ endif
 # but GNU make versions <= 3.78.1 or perhaps later have a bug
 # that causes a segfault;  GNU make 3.81 or later fixes this.
 ifeq (,$(ZIC))
+ifeq ($(PORTNAME), emscripten)
+ZIC= /usr/sbin/zic
+else
 ZIC= ./zic
 endif
+endif
 
 zic: $(ZICOBJS) | submake-libpgport
 	$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o $@$(X)
@@ -77,3 +81,6 @@ endif
 
 clean distclean:
 	rm -f zic$(X) $(ZICOBJS) abbrevs.txt
+ifeq ($(PORTNAME), emscripten)
+	rm -f zic.wasm
+endif
\ No newline at end of file
diff --git a/wasm-build/sdk_port.h b/wasm-build/include/sdk_port.h
similarity index 100%
rename from wasm-build/sdk_port.h
rename to wasm-build/include/sdk_port.h
diff --git a/wasm-builder/Dockerfile b/wasm-builder/Dockerfile
deleted file mode 100644
index a806e5e098b16..0000000000000
--- a/wasm-builder/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM debian:12 AS build_sdk
-
-ARG PG_VERSION=17.5
-ARG SDK_VERSION=3.1.74.11bi-w-n
-ARG DEBUG=false
-ARG OBJDUMP=true
-ARG PG_BRANCH=REL_17_5_WASM-pglite
-
-ENV \
-  PG_VERSION=$PG_VERSION \
-  SDK_VERSION=$SDK_VERSION \
-  SDKROOT=/tmp/sdk \
-  SYS_PYTHON=/usr/bin/python3 \
-  DEBUG=$DEBUG \
-  BUILDS=3.12 \
-  EMFLAVOUR=3.1.74
-
-RUN apt-get update && \
-  apt-get install -y git wget lz4 bzip2 pv bash python3 build-essential libreadline-dev zlib1g-dev bison flex xz-utils perl
-
-RUN apt-get install -y clang autoconf wget curl lz4 lsb-release zlib1g-dev libssl-dev 
-
-RUN bash -c "wget -qO- https://github.com/electric-sql/portable-sdk/releases/download/3.1.74.12.0/python3.13-wasm-sdk-debian12-$(arch).tar.lz4 | lz4 -d | tar -xvf -"
diff --git a/wasm-builder/build-with-docker.sh b/wasm-builder/build-with-docker.sh
deleted file mode 100755
index 6396781c40027..0000000000000
--- a/wasm-builder/build-with-docker.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-# we are using a custom emsdk to build pglite wasm
-# this is available as a docker image under electricsql/pglite-builder
-IMG_NAME=${IMG_NAME:-"electricsql/pglite-builder"}
-
-[ -f postgres-pglite/configure ] || ln -s . postgres-pglite
-
-export WORKSPACE=${GITHUB_WORKSPACE:-$(pwd)}
-
-# normally would default to /workspace but that may cause trouble with debug paths in some IDE
-export DOCKER_WORKSPACE=${DOCKER_WORKSPACE:-$WORKSPACE}
-
-cd $(realpath ${WORKSPACE}/postgres-pglite)
-
-[ -f ${BUILD_CONFIG:-postgres-pglite}/.buildconfig ] && cp ${BUILD_CONFIG:-postgres-pglite}/.buildconfig .buildconfig
-[ -f ./pglite/.buildconfig ] && cp ./pglite/.buildconfig .buildconfig
-
-
-source .buildconfig
-
-cat .buildconfig
-
-
-if echo $IMG_NAME|grep -q debian
-then
-    IMG_NAME="debian"
-    IMG_TAG="12"
-    wget -q -Osdk.tar.lz4 \
-     https://github.com/electric-sql/portable-sdk/releases/download/${SDK_VERSION}/python3.13-wasm-sdk-${IMG_NAME}${IMG_TAG}-$(arch).tar.lz4
-else
-    IMG_TAG="${PG_VERSION}_${SDK_VERSION}"
-fi
-
-
-mkdir -p dist/pglite dist/extensions-emsdk
-
-if echo -n $@|grep -q it$
-then
-    PROMPT="&& bash ) || bash"
-else
-    PROMPT=")"
-fi
-
-if $WASI 
-then
-    OUT_DIR=wasi
-else 
-    OUT_DIR=emscripten
-fi
-
-if $DEBUG
-then
-    MAP_OUT_DIRS="-v ${WORKSPACE}/postgres-pglite/out/${OUT_DIR}/build:/tmp/sdk/build:rw -v ${WORKSPACE}/postgres-pglite/out/${OUT_DIR}/pglite:/tmp/pglite:rw"
-else
-    MAP_OUT_DIRS=""
-fi
-
-docker run $@ \
-  --rm \
-  --env-file .buildconfig \
-  -e DEBUG=${DEBUG:-false} \
-  -e WASI=${WASI:-false} \
-  --workdir=${DOCKER_WORKSPACE} \
-  -v ${WORKSPACE}/postgres-pglite:${DOCKER_WORKSPACE}:rw \
-  -v ${WORKSPACE}/postgres-pglite/dist:/tmp/sdk/dist:rw \
-  $MAP_OUT_DIRS \
-  $IMG_NAME:$IMG_TAG \
-  bash --noprofile --rcfile ./docker_rc.sh -ci "( ./wasm-build.sh ${WHAT:-\"contrib extra\"} $PROMPT"