diff -ruN libglpng-1.45.orig/include/GL/glpng.h libglpng-1.45/include/GL/glpng.h
--- libglpng-1.45.orig/include/GL/glpng.h	2013-08-03 08:34:31.000000000 -0400
+++ libglpng-1.45/include/GL/glpng.h	2013-08-03 08:33:21.000000000 -0400
@@ -57,7 +57,7 @@
 #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
 
 /* Transparency parameters */
-#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
+#define PNG_CALLBACK_FUNC -3 /* Call the callback function to generate alpha   */
 #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
 #define PNG_SOLID     -1 /* No transparency                                */
 #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
diff -ruN libglpng-1.45.orig/src/Makefile libglpng-1.45/src/Makefile
--- libglpng-1.45.orig/src/Makefile	1969-12-31 19:00:00.000000000 -0500
+++ libglpng-1.45/src/Makefile	2013-08-03 08:33:21.000000000 -0400
@@ -0,0 +1,30 @@
+CC = gcc -MD
+#CFLAGS = 
+#CPPFLAGS =
+#DESTDIR =
+INSTALL = install
+INSTALL_DATA = $(INSTALL) -m 644
+LD = $(CC)
+#LDFLAGS = 
+LN = ln
+MKDIR = mkdir -p
+#PREFIX = 
+
+all: libglpng.a libglpng.1.dylib
+
+libglpng.o:
+	$(CC) $(CFLAGS) -I../include $(CPPFLAGS) -c -o libglpng.o glpng.c
+
+libglpng.a: libglpng.o
+	$(AR) cqs libglpng.a libglpng.o
+
+libglpng.1.dylib: libglpng.o
+	$(LD) $(LDFLAGS) -dynamiclib -install_name $(PREFIX)/lib/libglpng.1.dylib -framework OpenGL -lpng -lz -lm -o libglpng.1.dylib libglpng.o
+
+install: all
+	$(MKDIR) $(DESTDIR)$(PREFIX)/lib
+	$(INSTALL_DATA) libglpng.1.dylib $(DESTDIR)$(PREFIX)/lib
+	$(INSTALL_DATA) libglpng.a $(DESTDIR)$(PREFIX)/lib
+	$(LN) -sf libglpng.1.dylib $(DESTDIR)$(PREFIX)/lib/libglpng.dylib
+	$(MKDIR) $(DESTDIR)$(PREFIX)/include/GL/
+	$(INSTALL_DATA) ../include/GL/glpng.h $(DESTDIR)$(PREFIX)/include/GL/
diff -ruN libglpng-1.45.orig/src/glpng.c libglpng-1.45/src/glpng.c
--- libglpng-1.45.orig/src/glpng.c	2013-08-03 08:34:31.000000000 -0400
+++ libglpng-1.45/src/glpng.c	2013-08-03 08:33:21.000000000 -0400
@@ -26,10 +26,11 @@
 #endif
 
 #include <GL/glpng.h>
-#include <GL/gl.h>
+#include <OpenGL/gl.h>
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
-#include "png/png.h"
+#include <png.h>
 
 /* Used to decide if GL/gl.h supports the paletted extension */
 #ifdef GL_COLOR_INDEX1_EXT
@@ -276,7 +277,11 @@
 	endinfo = png_create_info_struct(png);
 
 	// DH: added following lines
+#if PNG_LIBPNG_VER >= 10400
+	if (setjmp(png_jmpbuf(png)))
+#else
 	if (setjmp(png->jmpbuf))
+#endif
 	{
 		png_destroy_read_struct(&png, &info, &endinfo);
 		return 0;
@@ -380,7 +385,11 @@
 	endinfo = png_create_info_struct(png);
 
 	// DH: added following lines
+#if PNG_LIBPNG_VER >= 10400
+	if (setjmp(png_jmpbuf(png)))
+#else
 	if (setjmp(png->jmpbuf))
+#endif
 	{
 		png_destroy_read_struct(&png, &info, &endinfo);
 		return 0;
@@ -559,7 +568,7 @@
 			#define ALPHA *q
 
 			switch (trans) {
-				case PNG_CALLBACK:
+				case PNG_CALLBACK_FUNC:
 					FORSTART
 						ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
 					FOREND