diff --git a/transcode/.footprint b/transcode/.footprint
index 8001f546a..e43d9365e 100644
--- a/transcode/.footprint
+++ b/transcode/.footprint
@@ -5,6 +5,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/avimerge
 -rwxr-xr-x	root/root	usr/bin/avisplit
 -rwxr-xr-x	root/root	usr/bin/avisync
+-rwxr-xr-x	root/root	usr/bin/pgm2txt
 -rwxr-xr-x	root/root	usr/bin/srttool
 -rwxr-xr-x	root/root	usr/bin/subtitle2pgm
 -rwxr-xr-x	root/root	usr/bin/subtitle2vobsub
@@ -20,6 +21,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/tcxpm2rgb
 -rwxr-xr-x	root/root	usr/bin/tcyait
 -rwxr-xr-x	root/root	usr/bin/transcode
+-rwxr-xr-x	root/root	usr/bin/vobsub2pgm
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/transcode/
 -rwxr-xr-x	root/root	usr/lib/transcode/a52_decore.la
diff --git a/transcode/.md5sum b/transcode/.md5sum
index 6fc00f964..22162d794 100644
--- a/transcode/.md5sum
+++ b/transcode/.md5sum
@@ -1,4 +1,6 @@
 c0bd49a88f667c68c4430ad25bbed510  subtitleripper-0.3-4.tgz
+a8d4d78e3311f576c7da27f2657358fd  subtitleripper-0.3.4-linkingorder.patch
+f9b367044568d0ef4612770969c93e14  subtitleripper-0.3.4-respect-ldflags.patch
 3cf2826df9a1a238c255a8525a63b435  transcode-1.1.7-ffmpeg-0.10.patch
 e78dfec264287e3ef09fae07e3477e5c  transcode-1.1.7-ffmpeg-0.11.patch
 69f3db45ae31213ea94a5dc0dda677bd  transcode-1.1.7-ffmpeg.patch
diff --git a/transcode/Pkgfile b/transcode/Pkgfile
index c6fa11e06..26a0a9338 100644
--- a/transcode/Pkgfile
+++ b/transcode/Pkgfile
@@ -6,7 +6,7 @@
 
 name=transcode
 version=1.1.7
-release=2
+release=3
 source=(https://bitbucket.org/france/transcode-tcforge/downloads/$name-$version.tar.bz2
 	http://downloads.sourceforge.net/project/subtitleripper/subtitleripper/subtitleripper-0.3-4/subtitleripper-0.3-4.tgz
 	transcode-1.1.7-ffmpeg.patch
@@ -15,7 +15,9 @@ source=(https://bitbucket.org/france/transcode-tcforge/downloads/$name-$version.
 	transcode-1.1.7-preset-free.patch
 	transcode-1.1.7-libav-9.patch
 	transcode-1.1.7-preset-force.patch
-	transcode-1.1.7-ffmpeg2.patch)
+	transcode-1.1.7-ffmpeg2.patch
+	subtitleripper-0.3.4-linkingorder.patch
+	subtitleripper-0.3.4-respect-ldflags.patch)
 
 build() {
 	cd $name-$version
@@ -28,6 +30,7 @@ build() {
 	patch -p 0 -i $SRC/transcode-1.1.7-libav-9.patch
 	patch -p 1 -i $SRC/transcode-1.1.7-preset-force.patch
 	patch -p 1 -i $SRC/transcode-1.1.7-ffmpeg2.patch
+	sed -i -e 's|freetype/ftglyph.h|freetype2/ftglyph.h|' filter/subtitler/load_font.c
 	libtoolize
 
 	./configure \
@@ -59,11 +62,17 @@ build() {
 	make DESTDIR=$PKG install
 	rm -r $PKG/usr/share
 
-	# Subtitle support (Han Boetes)
-	mkdir -p contrib/subrip
-	cd contrib/subrip
-	cp ../../../subtitleripper/* .
-	sed -i -e 's|.*ppm.*||i' Makefile
-	make clean all CFLAGS="$CFLAGS -DHAVE_GETLINE"
-	install -m 0755 -D srttool subtitle2pgm subtitle2vobsub $PKG/usr/bin
+	# Subtitle support
+	cd ../subtitleripper
+	patch -p1 -i $SRC/subtitleripper-0.3.4-linkingorder.patch
+	patch -p1 -i $SRC/subtitleripper-0.3.4-respect-ldflags.patch
+
+	sed \
+		-e 's|^\(.*lppm.*\)$|#\1|' \
+		-e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
+		-e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
+		-i Makefile
+	
+	make
+	install -m 0755 -D pgm2txt srttool subtitle2pgm subtitle2vobsub vobsub2pgm $PKG/usr/bin
 }
diff --git a/transcode/subtitleripper-0.3.4-linkingorder.patch b/transcode/subtitleripper-0.3.4-linkingorder.patch
new file mode 100644
index 000000000..7efe22346
--- /dev/null
+++ b/transcode/subtitleripper-0.3.4-linkingorder.patch
@@ -0,0 +1,28 @@
+Index: subtitleripper/Makefile
+===================================================================
+--- subtitleripper.orig/Makefile
++++ subtitleripper/Makefile
+@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) $^ -o $@  
++	@$(CC) $^ -o $@ $(LIBS)
+ 
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o 
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) $^ -o $@  
++	@$(CC) $^ -o $@ $(LIBS)
+ 
+ srttool: srttool.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) -g $^ -o $@  
++	@$(CC) -g $^ -o $@ $(LIBS)
+ 
+ vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $(LIBS) -g $^ -o $@  
++	@$(CC) -g $^ -o $@ $(LIBS)
+ 
+ .PHONY: clean dist rpm
+ clean:
diff --git a/transcode/subtitleripper-0.3.4-respect-ldflags.patch b/transcode/subtitleripper-0.3.4-respect-ldflags.patch
new file mode 100644
index 000000000..2af11d257
--- /dev/null
+++ b/transcode/subtitleripper-0.3.4-respect-ldflags.patch
@@ -0,0 +1,28 @@
+Index: subtitleripper/Makefile
+===================================================================
+--- subtitleripper.orig/Makefile
++++ subtitleripper/Makefile
+@@ -70,19 +70,19 @@ vobsub2pgm.o: vobsub2pgm.c vobsub.h spud
+ # Target
+ subtitle2pgm: subtitle2pgm.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ subtitle2vobsub: subtitle2vobsub.o vobsub.o 
+ 	@echo "Linking $@"
+-	@$(CC) $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ srttool: srttool.o
+ 	@echo "Linking $@"
+-	@$(CC) -g $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
+ 	@echo "Linking $@"
+-	@$(CC) -g $^ -o $@ $(LIBS)
++	@$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
+ 
+ .PHONY: clean dist rpm
+ clean: