diff --git a/dos/bccdos.mak b/dos/bccdos.mak
index 9447a785..144aad14 100644
--- a/dos/bccdos.mak
+++ b/dos/bccdos.mak
@@ -320,7 +320,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Borland C++ 3.1 PDC$(VER)BCC.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -331,9 +331,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)bcc -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)bcc -@ <flist
 	del flist
 	del file_id.diz
diff --git a/dos/gccdos.mak b/dos/gccdos.mak
index 6c1a8402..e48cce3f 100644
--- a/dos/gccdos.mak
+++ b/dos/gccdos.mak
@@ -352,9 +352,12 @@ dist: $(PDCLIBS)
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
 	echo $(LIBCURSES) >> flist
 	echo $(LIBPANEL) >> flist
-	zip -j pdc$(VER)djg -@ <flist
+	zip -jX pdc$(VER)djg -@ <flist
 	del flist
 	del file_id.diz
diff --git a/dos/mscdos.mak b/dos/mscdos.mak
index d67d1341..0e74d26a 100644
--- a/dos/mscdos.mak
+++ b/dos/mscdos.mak
@@ -327,7 +327,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -Fo$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Microsoft C++ 6.0 PDC$(VER)MSC.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -338,9 +338,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)msc -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)msc -@ <flist
 	del flist
 	del file_id.diz
diff --git a/dos/msvcdos.mak b/dos/msvcdos.mak
index 02488baf..3de2a67f 100644
--- a/dos/msvcdos.mak
+++ b/dos/msvcdos.mak
@@ -327,7 +327,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -Fo$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Microsoft Visual C++ 1.0 PDC$(VER)VCD.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -338,9 +338,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)vcd -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)vcd -@ <flist
 	del flist
 	del file_id.diz
diff --git a/dos/wccdos16.mak b/dos/wccdos16.mak
index a43e4a27..c5b90e70 100644
--- a/dos/wccdos16.mak
+++ b/dos/wccdos16.mak
@@ -371,7 +371,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) /fo=$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT)   for Watcom C++ 16bit DOS   PDC$(VER)16W.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -382,9 +382,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)16w -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)16w -@ <flist
 	del flist
 	del file_id.diz
diff --git a/dos/wccdos4g.mak b/dos/wccdos4g.mak
index 260db68d..b3d67e3d 100644
--- a/dos/wccdos4g.mak
+++ b/dos/wccdos4g.mak
@@ -370,7 +370,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) /fo=$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Watcom C++ 32bit DOS PDC$(VER)32W.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -381,9 +381,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)32w -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)32w -@ <flist
 	del flist
 	del file_id.diz
diff --git a/makezip.cmd b/makezip.cmd
index 66b5b8c3..43bb9a1a 100755
--- a/makezip.cmd
+++ b/makezip.cmd
@@ -15,6 +15,15 @@ If Stream('tmp','C','QUERY EXISTS') = '' Then  'mkdir tmp'
 rc = Chdir('tmp')
 If rc \= 0 Then Abort( 'Cannot change dir to "tmp"' )
 'del *.*'
+
+'copy' curses_home || '\README .'
+'copy' curses_home || '\readme.'version' .'
+'copy' curses_home || '\maintain.er .'
+'copy' curses_home || '\curses.h .'
+'copy' curses_home || '\curspriv.h .'
+'copy' curses_home || '\panel.h .'
+'copy' curses_home || '\term.h .'
+
 Select
    When plat = 'DOS' Then
       Do
@@ -127,7 +136,7 @@ Select
                   'copy  ..\pdcurses.a .'
                   'copy  ..\panel.a .'
                   zipfile = 'pdc'version'_ming_w32.zip'
-                  Call makefileid zipfile verdot version 'Win32 MingW32'
+                  Call makefileid zipfile verdot version 'Win32 MinGW'
                End
             When target = 'WCC' Then
                Do
@@ -147,13 +156,6 @@ Select
          End
       End
 End
-'copy' curses_home || '\curses.h .'
-'copy' curses_home || '\curspriv.h .'
-'copy' curses_home || '\panel.h .'
-'copy' curses_home || '\term.h .'
-'copy' curses_home || '\maintain.er .'
-'copy' curses_home || '\README .'
-'copy' curses_home || '\readme.'version' .'
 
 'zip' zipfile '*'
 Return 0
diff --git a/os2/bccos2.mak b/os2/bccos2.mak
index 666bfe29..160b9503 100644
--- a/os2/bccos2.mak
+++ b/os2/bccos2.mak
@@ -318,7 +318,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Borland C++ OS/2 1.0 PDC$(VER)BCOS2.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -329,9 +329,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)bcos2 -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)bcos2 -@ <flist
 	del flist
 	del file_id.diz
diff --git a/os2/gccos2.mak b/os2/gccos2.mak
index 83546e41..5800fe0d 100644
--- a/os2/gccos2.mak
+++ b/os2/gccos2.mak
@@ -579,7 +579,10 @@ dist: $(DISTTARGETS)
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
 	echo curses.dll >> flist
 	echo curses.lib >> flist
 	echo curses.a >> flist
@@ -587,6 +590,6 @@ dist: $(DISTTARGETS)
 	echo pdcurses.lib >> flist
 	echo panel.a >> flist
 	echo panel.lib >> flist
-	zip -j pdc$(VER)_emx_os2 -@ <flist
+	zip -jX pdc$(VER)_emx_os2 -@ <flist
 	del flist
 	del file_id.diz
diff --git a/os2/iccos2.mak b/os2/iccos2.mak
index bf7cdd6d..fdae512c 100644
--- a/os2/iccos2.mak
+++ b/os2/iccos2.mak
@@ -52,10 +52,10 @@ LIBEXE		= lib
 LIBCURSES	= pdcurses.lib
 LIBPANEL	= panel.lib
 
-LIBRARIES	= $(LIBCURSES) $(LIBPANEL)
+PDCLIBS		= $(LIBCURSES) $(LIBPANEL)
 
 ################################################################################
-all:	$(LIBRARIES)
+all:	$(PDCLIBS)
 
 clean:
 	-del *.obj
@@ -321,7 +321,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -Fo$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT)   for C Set/2 OS/2   PDC$(VER)_ICC_OS2.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -332,9 +332,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)_icc_os2 -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)_icc_os2 -@ <flist
 	del flist
 	del file_id.diz
diff --git a/os2/owos2.mak b/os2/owos2.mak
index a57201da..173ae85c 100644
--- a/os2/owos2.mak
+++ b/os2/owos2.mak
@@ -364,7 +364,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) /fo=$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT)   for Watcom C++ OS/2   PDC$(VER)_WCC_OS2.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -375,9 +375,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)_wcc_os2 -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)_wcc_os2 -@ <flist
 	del flist
 	del file_id.diz
diff --git a/os2/wccos2.mak b/os2/wccos2.mak
index d8b693e5..0e72bc1a 100644
--- a/os2/wccos2.mak
+++ b/os2/wccos2.mak
@@ -364,7 +364,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) /fo=$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT)   for Watcom C++ OS/2   PDC$(VER)_WCC_OS2.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -375,9 +375,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)_wcc_os2 -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)_wcc_os2 -@ <flist
 	del flist
 	del file_id.diz
diff --git a/win32/bccwin32.mak b/win32/bccwin32.mak
index 767b2ab8..cc776a21 100644
--- a/win32/bccwin32.mak
+++ b/win32/bccwin32.mak
@@ -321,7 +321,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Borland C++ Win32 PDC$(VER)_BCC_W32.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -332,9 +332,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)_bcc_w32 -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)_bcc_w32 -@ <flist
 	del flist
 	del file_id.diz
diff --git a/win32/gccwin32.mak b/win32/gccwin32.mak
index 3e588751..08cf5f2a 100644
--- a/win32/gccwin32.mak
+++ b/win32/gccwin32.mak
@@ -327,7 +327,7 @@ tuidemo.o: $(demodir)/tuidemo.c $(PDCURSES_CURSES_H)
 xmas.o: $(demodir)/xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)/xmas.c
 
-dist: $(LIBCURSES) $(LIBPANEL)
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Cygnus Win32 PDC$(VER)_CYG_W32.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -344,5 +344,5 @@ dist: $(LIBCURSES) $(LIBPANEL)
 	echo $(PDCURSES_HOME)/term.h >> flist
 	echo $(LIBCURSES) >> flist
 	echo $(LIBPANEL) >> flist
-	zip -j pdc$(VER)_cyg_w32 -@ <flist
+	zip -jX pdc$(VER)_cyg_w32 -@ <flist
 	rm flist file_id.diz
diff --git a/win32/lccwin32.mak b/win32/lccwin32.mak
index 00ae1abe..db625f2f 100644
--- a/win32/lccwin32.mak
+++ b/win32/lccwin32.mak
@@ -579,3 +579,24 @@ xmas.dll.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 
 test.dll.obj: test.c $(PDCURSES_CURSES_H)
 	$(CC) $(DLL_CCFLAGS) -Fo$@ test.c
+
+dist: $(PDCLIBS)
+	echo      PDCurses - Public Domain Curses > file_id.diz
+	echo  Version $(VERDOT) for LCC-Win32 PDC$(VER)_LCC_W32.ZIP >> file_id.diz
+	echo  ------------------------------------------ >> file_id.diz
+	echo  Public Domain Curses library for >> file_id.diz
+	echo  LCC-Win32. >> file_id.diz
+	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
+	echo  Public Domain. >> file_id.diz
+	echo $(PDCURSES_HOME)\README > flist
+	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)_lcc_w32 -@ <flist
+	del flist
+	del file_id.diz
diff --git a/win32/mingwin32.mak b/win32/mingwin32.mak
index 28a3fcd8..d19ab52e 100644
--- a/win32/mingwin32.mak
+++ b/win32/mingwin32.mak
@@ -1,6 +1,6 @@
 ################################################################################
 #
-# GNU MAKE Makefile for PDCurses library - WIN32 MingW32 GCC
+# GNU MAKE Makefile for PDCurses library - WIN32 MinGW GCC
 #
 # Usage: make -f [path\]gccwin32.mak [-DDEBUG] [target]
 #
@@ -322,3 +322,24 @@ tuidemo.o: $(demodir)/tuidemo.c $(PDCURSES_CURSES_H)
 
 xmas.o: $(demodir)/xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)/xmas.c
+
+dist: $(PDCLIBS)
+	echo      PDCurses - Public Domain Curses > file_id.diz
+	echo  Version $(VERDOT) for MinGW Win32 PDC$(VER)_BCC_W32.ZIP >> file_id.diz
+	echo  ------------------------------------------ >> file_id.diz
+	echo  Public Domain Curses library for >> file_id.diz
+	echo  MinGW for Win32. >> file_id.diz
+	echo  Source available in PDCURS$(VER).ZIP >> file_id.diz
+	echo  Public Domain. >> file_id.diz
+	echo $(PDCURSES_HOME)\README > flist
+	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
+	echo $(PDCURSES_HOME)\maintain.er >> flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)_ming_w32 -@ <flist
+	del flist
+	del file_id.diz
diff --git a/win32/vcwin32.mak b/win32/vcwin32.mak
index 28c87db9..f3dad9f1 100644
--- a/win32/vcwin32.mak
+++ b/win32/vcwin32.mak
@@ -602,7 +602,7 @@ xmas.dll.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 test.dll.obj: test.c $(PDCURSES_CURSES_H)
 	$(CC) $(DLL_CCFLAGS) -Fo$@ test.c
 
-dist: curses.dll pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT)   for VC++        PDC$(VER)_VC_W32.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -613,11 +613,14 @@ dist: curses.dll pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo curses.dll >> flist
-	echo curses.lib >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)_vc_w32 -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+#	echo curses.dll >> flist
+#	echo curses.lib >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)_vc_w32 -@ <flist
 	del flist
 	del file_id.diz
diff --git a/win32/wccwin32.mak b/win32/wccwin32.mak
index fce4ac90..a661b28a 100644
--- a/win32/wccwin32.mak
+++ b/win32/wccwin32.mak
@@ -362,7 +362,7 @@ tuidemo.obj: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.obj: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) /fo=$@ $(demodir)\xmas.c
 
-dist: pdcurses.lib panel.lib
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > file_id.diz
 	echo  Version $(VERDOT) for Watcom C++ Win32 PDC$(VER)_WCC_W32.ZIP >> file_id.diz
 	echo  ------------------------------------------ >> file_id.diz
@@ -373,9 +373,12 @@ dist: pdcurses.lib panel.lib
 	echo $(PDCURSES_HOME)\README > flist
 	echo $(PDCURSES_HOME)\readme.$(VER) >> flist
 	echo $(PDCURSES_HOME)\maintain.er >> flist
-	echo $(PDCURSES_HOME)\*.h >> flist
-	echo pdcurses.lib >> flist
-	echo panel.lib >> flist
-	zip -j pdc$(VER)_wcc_w32 -@ <flist
+	echo $(PDCURSES_HOME)\curses.h >> flist
+	echo $(PDCURSES_HOME)\curspriv.h >> flist
+	echo $(PDCURSES_HOME)\panel.h >> flist
+	echo $(PDCURSES_HOME)\term.h >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
+	zip -jX pdc$(VER)_wcc_w32 -@ <flist
 	del flist
 	del file_id.diz