Index: .github/workflows/onefiledist.yml
==================================================================
--- .github/workflows/onefiledist.yml
+++ .github/workflows/onefiledist.yml
@@ -19,17 +19,17 @@
       - name: Configure
         run: ./configure --disable-symbols --disable-shared --enable-zipfs
         working-directory: unix
       - name: Build
         run: |
-          make tclsh tclzipfile
+          make tclsh
           make shell SCRIPT="$VER_PATH $GITHUB_ENV"
           echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
         working-directory: unix
       - name: Package
         run: |
-          cat ../unix/tclsh $TCL_ZIP > tclsh${TCL_PATCHLEVEL}_unofficial
+          cp ../unix/tclsh tclsh${TCL_PATCHLEVEL}_unofficial
           chmod +x tclsh${TCL_PATCHLEVEL}_unofficial
           tar -cf tclsh${TCL_PATCHLEVEL}_unofficial.tar tclsh${TCL_PATCHLEVEL}_unofficial
         working-directory: 1dist
       - name: Upload
         uses: actions/upload-artifact@v2
@@ -60,19 +60,19 @@
       - name: Configure
         run: ./configure --disable-symbols --disable-shared --enable-zipfs
         working-directory: unix
       - name: Build
         run: |
-          make tclsh tclzipfile
+          make tclsh
           make shell SCRIPT="$VER_PATH $GITHUB_ENV"
           echo "TCL_BIN=`pwd`/tclsh" >> $GITHUB_ENV
           echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
         working-directory: unix
       - name: Package
         run: |
           mkdir contents
-          cat $TCL_BIN $TCL_ZIP > contents/tclsh${TCL_PATCHLEVEL}_unofficial
+          cp $TCL_BIN contents/tclsh${TCL_PATCHLEVEL}_unofficial
           chmod +x contents/tclsh${TCL_PATCHLEVEL}_unofficial
           cat > contents/README.txt <<EOF
           This is a single-file executable developer preview of Tcl $TCL_PATCHLEVEL
 
           It is not intended as an official release at all, so it is unsigned and unnotarized.
@@ -114,25 +114,21 @@
       - name: Configure
         run: ./configure --disable-symbols --disable-shared --enable-zipfs
         working-directory: win
       - name: Build
         run: |
-          make binaries libraries tclzipfile
+          make binaries libraries
           echo "TCL_ZIP=`pwd`/`echo libtcl*.zip`" >> $GITHUB_ENV
         working-directory: win
-      - name: Package
-        run: |
-          cat ../win/tclsh*.exe $TCL_ZIP > combined.exe
-        working-directory: 1dist
       - name: Get Exact Version
         run: |
-          ./combined.exe $VER_PATH $GITHUB_ENV
-        working-directory: 1dist
+          ./tclsh*.exe $VER_PATH $GITHUB_ENV
+        working-directory: win
       - name: Set Executable Name
         run: |
-          mv combined.exe tclsh${TCL_PATCHLEVEL}_unofficial.exe
+          cp ../win/tclsh*.exe tclsh${TCL_PATCHLEVEL}_unofficial.exe
         working-directory: 1dist
       - name: Upload
         uses: actions/upload-artifact@v2
         with:
           name: Tclsh ${{ env.TCL_PATCHLEVEL }} Windows single-file build (unofficial)
           path: '1dist/*_unofficial.exe'

Index: unix/Makefile.in
==================================================================
--- unix/Makefile.in
+++ unix/Makefile.in
@@ -812,14 +812,19 @@
 tclLibObjs:
 	@echo ${OBJS}
 # This targets actually build the objects needed for the lib in the above case
 objs: ${OBJS}
 
-${TCL_EXE}: ${TCLSH_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE}
+${TCL_EXE}: ${TCLSH_OBJS} ${TCL_LIB_FILE} ${TCL_STUB_LIB_FILE} ${TCL_ZIP_FILE}
 	${CC} ${CFLAGS} ${LDFLAGS} ${TCLSH_OBJS} \
 		@TCL_BUILD_LIB_SPEC@ ${TCL_STUB_LIB_FILE} ${LIBS} @EXTRA_TCLSH_LIBS@ \
 		${CC_SEARCH_FLAGS} -o ${TCL_EXE}
+	@if test "${ZIPFS_BUILD}" = "2" ; then \
+	    cat ${TCL_ZIP_FILE} >> ${TCL_EXE}; \
+	    ${NATIVE_ZIP} -A ${TCL_EXE} \
+	    || echo 'ignore zip-error by adjust sfx process (not executable?)'; \
+	fi
 
 # Must be empty so it doesn't conflict with rule for ${TCL_EXE} above
 ${NATIVE_TCLSH}:
 
 Makefile: $(UNIX_DIR)/Makefile.in $(DLTEST_DIR)/Makefile.in

Index: win/Makefile.in
==================================================================
--- win/Makefile.in
+++ win/Makefile.in
@@ -543,15 +543,20 @@
 	  cd ${TCL_VFS_ROOT} && \
 	  $$zip ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} >/dev/null && \
 	  echo "${TCL_ZIP_FILE} successful created with $$zip" && \
 	  cd ..)
 
-$(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES)
+$(TCLSH): $(TCLSH_OBJS) @LIBRARIES@ $(TCL_STUB_LIB_FILE) tclsh.$(RES) ${TCL_ZIP_FILE}
 	$(CC) $(CFLAGS) $(TCLSH_OBJS) $(TCL_LIB_FILE) $(TCL_STUB_LIB_FILE) $(LIBS) \
 	tclsh.$(RES) $(CC_EXENAME) $(LDFLAGS_CONSOLE)
 	$(COPY) tclsh.exe.manifest $(TCLSH).manifest
 	@VC_MANIFEST_EMBED_EXE@
+	@if test "${ZIPFS_BUILD}" = "2" ; then \
+		cat ${TCL_ZIP_FILE} >> ${TCLSH}; \
+		${NATIVE_ZIP} -A ${TCLSH} \
+		  || echo 'ignore zip-error by adjust sfx process (not executable?)'; \
+	fi
 
 cat32.$(OBJEXT): cat.c
 	$(CC) -c $(CC_SWITCHES) -DUNICODE -D_UNICODE @DEPARG@ $(CC_OBJNAME)
 
 $(CAT32): cat32.$(OBJEXT)