diff --git a/ANNOUNCE b/ANNOUNCE
index ebc5060..82bca21 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
 
-Libpng 1.5.0beta04 - February 8, 2010
+Libpng 1.5.0beta04 - February 9, 2010
 
 This is not intended to be a public release.  It will be replaced
 within a few weeks by a public version or by another test version.
@@ -38,7 +38,8 @@
     calling png_error().
   Updated configure script to use SO number 15.
 
-version 1.5.0beta04 [February 8, 2010]
+version 1.5.0beta04 [February 9, 2010]
+  Removed malformed "incomplete struct declaration" of png_info from png.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/CHANGES b/CHANGES
index 5308f32..c338ff0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2514,7 +2514,8 @@
     calling png_error().
   Updated configure script to use SO number 15.
 
-version 1.5.0beta04 [February 8, 2010]
+version 1.5.0beta04 [February 9, 2010]
+  Removed malformed "incomplete struct declaration" of png_info from png.h
 
 Send comments/corrections/commendations to png-mng-implement at lists.sf.net
 (subscription required; visit
diff --git a/png.c b/png.c
index 2121a40..b84424f 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * Last changed in libpng 1.4.1 [February 8, 2010]
+ * Last changed in libpng 1.4.1 [February 9, 2010]
  * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -552,13 +552,13 @@
 #else
 #ifdef __STDC__
    return ((png_charp) PNG_STRING_NEWLINE \
-     "libpng version 1.5.0beta04 - February 8, 2010" PNG_STRING_NEWLINE \
+     "libpng version 1.5.0beta04 - February 9, 2010" PNG_STRING_NEWLINE \
      "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
      PNG_STRING_NEWLINE);
 #else
-      return ((png_charp) "libpng version 1.5.0beta04 - February 8, 2010\
+      return ((png_charp) "libpng version 1.5.0beta04 - February 9, 2010\
       Copyright (c) 1998-2010 Glenn Randers-Pehrson\
       Copyright (c) 1996-1997 Andreas Dilger\
       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");
diff --git a/png.h b/png.h
index def3a2e..be4f485 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.5.0beta04 - February 8, 2010
+ * libpng version 1.5.0beta04 - February 9, 2010
  * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -11,7 +11,7 @@
  * Authors and maintainers:
  *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.5.0beta04 - February 8, 2010: Glenn
+ *  libpng versions 0.97, January 1998, through 1.5.0beta04 - February 9, 2010: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -169,7 +169,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta04, February 8, 2010, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta04, February 9, 2010, are
  * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are
  * distributed according to the same disclaimer and license as libpng-1.2.5
  * with the following individual added to the list of Contributing Authors:
@@ -281,7 +281,7 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    February 8, 2010
+ *    February 9, 2010
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
@@ -345,7 +345,7 @@
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.5.0beta04"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.5.0beta04 - February 8, 2010\n"
+   " libpng version 1.5.0beta04 - February 9, 2010\n"
 
 #define PNG_LIBPNG_VER_SONUM   15
 #define PNG_LIBPNG_VER_DLLNUM  15
@@ -594,26 +594,9 @@
 
 #ifdef PNG_INTERNAL
 #include "pnginfo.h"
-#else
-
-/* provide an incomplete structure-type-reference for png_info */
-
-# if 1 /* this works on FreeBSD but is not in the C language. */
-       /* gcc (GCC) 4.2.1 20070719  [FreeBSD] */
-       /* also on Sunos running gcc (GCC) 4.3.4 */
-typedef struct { ; } png_info;
-# endif
-
-# if 0 /* does not work on FreeBSD or SunOS. */
-typedef struct png_info;
-# endif
-
-# if 0 /* does not work on FreeBSD  or SunOS */
-struct png_info;
-# endif
-
 #endif
 
+typedef struct png_info_def png_info;
 typedef png_info FAR * png_infop;
 typedef png_info FAR * FAR * png_infopp;
 
diff --git a/pngconf.h b/pngconf.h
index 6f52c90..7ff7eff 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
 
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng version 1.5.0beta04 - February 8, 2010
+ * libpng version 1.5.0beta04 - February 9, 2010
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pnginfo.h b/pnginfo.h
index 65deec6..f06997f 100644
--- a/pnginfo.h
+++ b/pnginfo.h
@@ -37,7 +37,7 @@
  * itxt_ptr structure argument, and the png_set_rows and png_set_unknowns
  * functions do not make their own copies.
  */
-typedef struct png_info_struct
+struct png_info_def
 {
    /* the following are necessary for every PNG file */
    png_uint_32 width PNG_DEPSTRUCT;  /* width of image in pixels (from IHDR) */
@@ -298,4 +298,4 @@
    png_fixed_point int_y_blue PNG_DEPSTRUCT;
 #endif
 
-} png_info;
+};
diff --git a/pngpriv.h b/pngpriv.h
index 9c8833e..8d0d2f3 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
 
 /* pngpriv.h - private declarations for use inside libpng
  *
- * libpng version 1.5.0beta04 - February 8, 2010
+ * libpng version 1.5.0beta04 - February 9, 2010
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998-2010 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)