diff --git a/Makefile.base.mk b/Makefile.base.mk
index a54ac40c..87ae06bd 100644
--- a/Makefile.base.mk
+++ b/Makefile.base.mk
@@ -199,8 +199,6 @@ LINK_OPTS  = -fdata-sections -ffunction-sections -Wl,-O1,--gc-sections
 ifeq ($(WASM),true)
 LINK_OPTS += -O3
 LINK_OPTS += -sAGGRESSIVE_VARIABLE_ELIMINATION=1
-LINK_OPTS += -sASYNCIFY
-LINK_OPTS += -sASYNCIFY_IMPORTS=puglGetAsyncClipboardData
 else
 LINK_OPTS += -Wl,--as-needed
 ifneq ($(SKIP_STRIPPING),true)
@@ -272,6 +270,11 @@ ifeq ($(MACOS_OLD),true)
 BUILD_CXX_FLAGS = $(BASE_FLAGS) $(CXXFLAGS) -DHAVE_CPP11_SUPPORT=0
 endif
 
+ifeq ($(WASM_CLIPBOARD),true)
+BUILD_CXX_FLAGS += -DPUGL_WASM_ASYNC_CLIPBOARD
+LINK_FLAGS      += -sASYNCIFY -sASYNCIFY_IMPORTS=puglGetAsyncClipboardData
+endif
+
 ifeq ($(WASM_EXCEPTIONS),true)
 BUILD_CXX_FLAGS += -fexceptions
 LINK_FLAGS      += -fexceptions
diff --git a/dgl/src/pugl-upstream b/dgl/src/pugl-upstream
index 0bf91c2c..09afe84f 160000
--- a/dgl/src/pugl-upstream
+++ b/dgl/src/pugl-upstream
@@ -1 +1 @@
-Subproject commit 0bf91c2c4c14db135386635e160304a4e085e55e
+Subproject commit 09afe84fcaa67adba7a168b8490046dab6ecf67d