--- subtitleripper.old/Makefile
+++ subtitleripper/Makefile
@@ -9,7 +9,7 @@
 
 ### enable ppm support ###
 DEFINES  += -D_HAVE_LIB_PPM_
-LIBS     += -lppm
+LIBS     += -lnetpbm
 
 ### enable PNG support ###
 DEFINES += -D_HAVE_PNG_
@@ -70,19 +70,19 @@
 # Target
 subtitle2pgm: subtitle2pgm.o spudec.o
 	@echo "Linking $@"
-	@$(CC) $(LIBS) $^ -o $@  
+	@$(CC) $(LIBS) $^ -o $@ $(LIBS)
 
 subtitle2vobsub: subtitle2vobsub.o vobsub.o 
 	@echo "Linking $@"
-	@$(CC) $(LIBS) $^ -o $@  
+	@$(CC) $(LIBS) $^ -o $@ $(LIBS)
 
 srttool: srttool.o
 	@echo "Linking $@"
-	@$(CC) $(LIBS) -g $^ -o $@  
+	@$(CC) $(LIBS) -g $^ -o $@ $(LIBS)
 
 vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
 	@echo "Linking $@"
-	@$(CC) $(LIBS) -g $^ -o $@  
+	@$(CC) $(LIBS) -g $^ -o $@ $(LIBS)
 
 .PHONY: clean dist rpm
 clean:
--- subtitleripper.old/spudec.c
+++ subtitleripper/spudec.c
@@ -32,6 +32,10 @@
 #include <assert.h>
 #include <string.h>
 
+#ifdef _HAVE_PNG_
+#include <png.h>
+#endif
+
 #ifdef _HAVE_ZLIB_
 #include <zlib.h>
 #endif
@@ -40,10 +44,6 @@
 #include <ppm.h>
 #endif
 
-#ifdef _HAVE_PNG_
-#include "png.h"
-#endif
-
 static void spudec_handle_rest(spudec_handle_t *this);
 
 // read a big endian 16 bit value