diff --git a/os2/gccos2.mak b/os2/gccos2.mak
index ddaae0b5..d7498662 100644
--- a/os2/gccos2.mak
+++ b/os2/gccos2.mak
@@ -58,7 +58,6 @@ endif
 
 DLLFLAGS = -Zdll -Zcrtdll -Zomf
 DLLCURSES = curses.lib
-DISTTARGETS = pdcurses.a panel.a
 
 CPPFLAGS	= -I$(PDCURSES_HOME) $(EMXVID)
 
@@ -76,7 +75,7 @@ LIBFLAGS		=rcv
 LIBCURSES	= pdcurses.a
 LIBPANEL	= panel.a
 
-PDCLIBS	= $(LIBCURSES) $(LIBPANEL) #$(DLLTARGET)
+PDCLIBS	= $(LIBCURSES) $(LIBPANEL) #$(DLLTARGET) pdcurses.lib panel.lib
 DEMOS	=testcurs.exe newdemo.exe xmas.exe tuidemo.exe firework.exe ptest.exe
 
 ################################################################################
@@ -571,7 +570,7 @@ tuidemo.o: $(demodir)\tuidemo.c $(PDCURSES_CURSES_H)
 xmas.o: $(demodir)\xmas.c $(PDCURSES_CURSES_H)
 	$(CC) $(CCFLAGS) -o$@ $(demodir)\xmas.c
 
-dist: $(DISTTARGETS)
+dist: $(PDCLIBS)
 	echo      PDCurses - Public Domain Curses > tmp\file_id.diz
 	echo  Version $(VERDOT)   for EMX OS/2   PDC$(VER)_EMX_OS2.ZIP >> tmp\file_id.diz
 	echo  ------------------------------------------ >> tmp\file_id.diz
@@ -586,8 +585,8 @@ dist: $(DISTTARGETS)
 	echo $(PDCURSES_HOME)\curspriv.h >> flist
 	echo $(PDCURSES_HOME)\panel.h >> flist
 	echo $(PDCURSES_HOME)\term.h >> flist
-	echo pdcurses.a >> flist
-	echo panel.a >> flist
+	echo $(LIBCURSES) >> flist
+	echo $(LIBPANEL) >> flist
 	zip -jX pdc$(VER)_emx_os2 -@ <flist
 	del flist
 	del file_id.diz
diff --git a/win32/lccwin32.mak b/win32/lccwin32.mak
index db625f2f..367909c3 100644
--- a/win32/lccwin32.mak
+++ b/win32/lccwin32.mak
@@ -63,8 +63,8 @@ all:    $(PDCLIBS) $(DEMOS) #$(DLL_DEMOS)
 clean:
 	-del *.obj
 	-del *.lib
-#	-del *.dll
-#	-del *.exp
+	-del *.dll
+	-del *.exp
 	-del *.exe
 
 demos:  $(DEMOS)
diff --git a/win32/vcwin32.mak b/win32/vcwin32.mak
index f3dad9f1..c934ec6d 100644
--- a/win32/vcwin32.mak
+++ b/win32/vcwin32.mak
@@ -71,9 +71,9 @@ all:	$(PDCLIBS) $(DEMOS) #$(DLL_DEMOS)
 clean:
 	-del *.obj
 	-del *.lib
-#	-del *.dll
-#	-del *.exp
-#	-del *.res
+	-del *.dll
+	-del *.exp
+	-del *.res
 	-del *.exe
 
 demos:	$(DEMOS)
@@ -617,8 +617,6 @@ dist: $(PDCLIBS)
 	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