diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index bc7be4a..0a89151 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -1,5 +1,5 @@
 # makefile for libpng on BeOS x86 ELF with gcc
-# modified from makefile.lnx by Sander Stoks
+# modified from makefile.linux by Sander Stoks
 # Copyright (C) 1996, 1997 Andreas Dilger
 # Copyright (C) 1999 Greg Roelofs
 # For conditions of distribution and use, see copyright notice in png.h
@@ -31,7 +31,7 @@
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.4
+PNGMIN = 1.0.4c
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # where make install puts libpng.a, libpng.so*, and png.h
diff --git a/scripts/makefile.borland b/scripts/makefile.borland
index 57f374f..2d3fe5b 100644
--- a/scripts/makefile.borland
+++ b/scripts/makefile.borland
@@ -2,8 +2,8 @@
 # Borland C++ 4.5 (Note: All modules are compiled in C mode)
 # Will work with C++ 4.02 also
 # To build the library, do: 
-#       "make -fmakefile.bor -DMODEL=m"
-# or:   "make -fmakefile.bor -DMODEL=l"
+#       "make -fmakefile.borland -DMODEL=m"
+# or:   "make -fmakefile.borland -DMODEL=l"
 #
 # ------------- Borland C++ 4.5 -------------
 
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 6f252e4..51403ca 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -14,7 +14,7 @@
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.4
+PNGMIN = 1.0.4c
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=cc
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 4201201..c84b6ce 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -22,6 +22,8 @@
 	-Wmissing-declarations -Wtraditional -Wcast-align \
 	-Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 
+# for pgcc version 2.95.1, -O3 is buggy; don't us it.
+
 CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
 LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
@@ -32,7 +34,7 @@
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.4
+PNGMIN = 1.0.4c
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index 6356218..96b2cfc 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -3,7 +3,7 @@
 # For conditions of distribution and use, see copyright notice in png.h
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
 
-# ------------- Microsoft C 5.1 and later -------------
+# -------- Microsoft C 5.1 and later, does not use assembler code -----
 MODEL=-AL
 CFLAGS=-Oait -Gs -nologo -W3 $(MODEL) -I..\zlib
 #-Ox generates bad code with MSC 5.1
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 9eee4a2..1e51004 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,7 +25,7 @@
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.4
+PNGMIN = 1.0.4c
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 5f3a412..fcc3078 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -1,5 +1,5 @@
 # makefile for libpng on Solaris 2.x with gcc
-# Contributed by William L. Sebok, based on makefile.lnx
+# Contributed by William L. Sebok, based on makefile.linux
 # Copyright (C) 1996, 1997 Andreas Dilger
 # Copyright (C) 1998 Greg Roelofs
 # For conditions of distribution and use, see copyright notice in png.h
@@ -36,7 +36,7 @@
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.4
+PNGMIN = 1.0.4c
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/makefile.turboc3 b/scripts/makefile.turboc3
index c925831..f9a2269 100644
--- a/scripts/makefile.turboc3
+++ b/scripts/makefile.turboc3
@@ -1,7 +1,7 @@
 # Makefile for libpng
 # TurboC++ 3.0 (Note: All modules are compiled in C mode)
 
-# To use, do "make -fmakefile.tc3"
+# To use, do "make -fmakefile.turboc3"
 
 # ------------- Turbo C++ 3.0 -------------
 MODEL=-ml
diff --git a/scripts/makefile.win32vc b/scripts/makefile.vcawin32
similarity index 86%
rename from scripts/makefile.win32vc
rename to scripts/makefile.vcawin32
index 52934c3..be7fcc8 100644
--- a/scripts/makefile.win32vc
+++ b/scripts/makefile.vcawin32
@@ -2,9 +2,15 @@
 # Copyright (C) 1998 Tim Wegner
 # For conditions of distribution and use, see copyright notice in png.h
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
-# To use, do "nmake /f scripts\makefile.w32"
+# To use, do "nmake /f scripts\makefile.vcawin32"
 
-# ------------- Microsoft Visual C++ 4.0 and later -------------
+# ---------- Microsoft Visual C++ 5.0 and later, uses assembler code------
+
+# Caution: the assembler code was introduced at libpng version 1.0.4 and has
+# not yet been thoroughly tested.
+
+# If you don't want to use assembler code, use makefile.vcwin32 instead.
+
 MODEL=- 
 CFLAGS=-DPNG_USE_PNGVCRD -Ox -GA3s -nologo -W3 -I..\zlib
 
diff --git a/scripts/makefile.win32vc b/scripts/makefile.vcwin32
similarity index 85%
copy from scripts/makefile.win32vc
copy to scripts/makefile.vcwin32
index 52934c3..5b62fc3 100644
--- a/scripts/makefile.win32vc
+++ b/scripts/makefile.vcwin32
@@ -2,11 +2,13 @@
 # Copyright (C) 1998 Tim Wegner
 # For conditions of distribution and use, see copyright notice in png.h
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
-# To use, do "nmake /f scripts\makefile.w32"
+# To use, do "nmake /f scripts\makefile.vcwin32"
 
-# ------------- Microsoft Visual C++ 4.0 and later -------------
+# ---------- Microsoft Visual C++ 4.0 and later, no assembler code------
+# If you want to use assembler code, use makefile.vcawin32 instead.
+
 MODEL=- 
-CFLAGS=-DPNG_USE_PNGVCRD -Ox -GA3s -nologo -W3 -I..\zlib
+CFLAGS= -Ox -GA3s -nologo -W3 -I..\zlib
 
 CC=cl
 LD=link
@@ -19,7 +21,7 @@
 # variables
 OBJS1 = png$(O) pngset$(O) pngget$(O) pngrutil$(O) pngtrans$(O) pngwutil$(O)
 OBJS2 = pngmem$(O) pngpread$(O) pngread$(O) pngerror$(O) pngwrite$(O)
-OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O) pngvcrd$(O)
+OBJS3 = pngrtran$(O) pngwtran$(O) pngrio$(O) pngwio$(O)
 
 all: libpng.lib
 
@@ -44,9 +46,6 @@
 pngrutil$(O): png.h pngconf.h pngasmrd.h
 	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
-pngvcrd$(O): png.h pngconf.h pngasmrd.h
-	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
-
 pngerror$(O): png.h pngconf.h
 	$(CC) -c $(CFLAGS) $*.c $(ERRFILE)
 
diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom
index a7d99c2..e14f162 100644
--- a/scripts/makefile.watcom
+++ b/scripts/makefile.watcom
@@ -5,7 +5,7 @@
 # For conditions of distribution and use, see copyright notice in png.h
 # Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
 
-# To use, do "wmake /f scripts\makefile.wat"
+# To use, do "wmake /f scripts\makefile.watcom"
 
 # ------------- Watcom 10.0 and later -------------
 MODEL=-mf
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index 94e859a..1441808 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -3,8 +3,8 @@
 interface
 
 const
-  PNG_LIBPNG_VER_STRING = '1.0.4';
-  PNG_LIBPNG_VER        =  10004;
+  PNG_LIBPNG_VER_STRING = '1.0.4c';
+  PNG_LIBPNG_VER        =  10005;
 
 type
   png_uint_32 = Cardinal;