diff --git a/debian/patches/0008-Ensure-that-the-picture-extracted-during-testing-is-.patch b/debian/patches/0008-Ensure-that-the-picture-extracted-during-testing-is-.patch
new file mode 100644
index 0000000..38f2f93
--- /dev/null
+++ b/debian/patches/0008-Ensure-that-the-picture-extracted-during-testing-is-.patch
@@ -0,0 +1,21 @@
+From: Willi Mann <willi@wm1.at>
+Date: Wed, 26 Dec 2012 10:12:07 +0100
+Subject: Ensure that the picture extracted during testing is also cleaned
+
+---
+ tests/Makefile.am |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index ea17293..4950e05 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -56,7 +56,7 @@ testresults_tex = Greek1.rtf.tex Greek2.rtf.tex  \
+         unicode4.rtf.tex
+ 
+ # need to wipe out test results on make clean
+-CLEANFILES = $(testresults_html) $(testresults_tex)
++CLEANFILES = $(testresults_html) $(testresults_tex) pict001.wmf
+ 
+ # add the test scripts and the test data to the distributed files
+ EXTRA_DIST = $(TESTS) $(testdata)
diff --git a/debian/patches/0009-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch b/debian/patches/0009-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch
new file mode 100644
index 0000000..6207c79
--- /dev/null
+++ b/debian/patches/0009-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch
@@ -0,0 +1,120 @@
+From: Willi Mann <willi@wm1.at>
+Date: Wed, 26 Dec 2012 10:38:56 +0100
+Subject: Update test file set to ensure proper cleaning of tests dir
+
+---
+ tests/Makefile.am |   80 ++++++++++++++++++++++++++++++++---------------------
+ 1 file changed, 49 insertions(+), 31 deletions(-)
+
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 4950e05..768a6d7 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -2,58 +2,76 @@
+ TESTS = test_html.sh
+ 
+ # the data set for the tests
+-testdata = Greek1.rtf Greek2.rtf  \
++testdata = accents.rtf \
+ 	ascii_decimal.rtf \
+ 	backslash.rtf \
++	body.rtf \
+ 	borders_shading.rtf \
+ 	braces.rtf \
+ 	character_formatting.rtf \
+ 	chars.rtf \
+ 	columns.rtf \
++	cp1251-russian-alphabet.rtf \
+ 	font_size.rtf \
+ 	font_styles.rtf \
++	Greek1.rtf \
++	Greek2.rtf \
+ 	lists.rtf \
+ 	paragraph_formatting.rtf \
++	pict.rtf \
+ 	symbol.rtf \
+ 	text_color.rtf \
+ 	text_formatting.rtf \
++	Turkish.rtf \
+ 	unicode4.rtf
+ 
+ # the result set for the html test
+-testresults_html = Greek1.rtf.html Greek2.rtf.html  \
++testresults_html = accents.rtf.html \
+ 	ascii_decimal.rtf.html \
+-        backslash.rtf.html \
+-        borders_shading.rtf.html \
+-        braces.rtf.html \
+-        character_formatting.rtf.html \
+-        chars.rtf.html \
+-        columns.rtf.html \
+-        font_size.rtf.html \
+-        font_styles.rtf.html \
+-        lists.rtf.html \
+-        paragraph_formatting.rtf.html \
+-        symbol.rtf.html \
+-        text_color.rtf.html \
+-        text_formatting.rtf.html \
+-        unicode4.rtf.html
++	backslash.rtf.html \
++	body.rtf.html \
++	borders_shading.rtf.html \
++	braces.rtf.html \
++	character_formatting.rtf.html \
++	chars.rtf.html \
++	columns.rtf.html \
++	cp1251-russian-alphabet.rtf.html \
++	font_size.rtf.html \
++	font_styles.rtf.html \
++	Greek1.rtf.html \
++	Greek2.rtf.html \
++	lists.rtf.html \
++	paragraph_formatting.rtf.html \
++	pict.rtf.html \
++	symbol.rtf.html \
++	text_color.rtf.html \
++	text_formatting.rtf.html \
++	Turkish.rtf.html \
++	unicode4.rtf.html
+ 
+ # the result set for the latex test
+-testresults_tex = Greek1.rtf.tex Greek2.rtf.tex  \
++testresults_tex = accents.rtf.tex \
+ 	ascii_decimal.rtf.tex \
+-        backslash.rtf.tex \
+-        borders_shading.rtf.tex \
+-        braces.rtf.tex \
+-        character_formatting.rtf.tex \
+-        chars.rtf.tex \
+-        columns.rtf.tex \
+-        font_size.rtf.tex \
+-        font_styles.rtf.tex \
+-        lists.rtf.tex \
+-        paragraph_formatting.rtf.tex \
+-        symbol.rtf.tex \
+-        text_color.rtf.tex \
+-        text_formatting.rtf.tex \
+-        unicode4.rtf.tex
++	backslash.rtf.tex \
++	body.rtf.tex \
++	borders_shading.rtf.tex \
++	braces.rtf.tex \
++	character_formatting.rtf.tex \
++	chars.rtf.tex \
++	columns.rtf.tex \
++	cp1251-russian-alphabet.rtf.tex \
++	font_size.rtf.tex \
++	font_styles.rtf.tex \
++	Greek1.rtf.tex \
++	Greek2.rtf.tex \
++	lists.rtf.tex \
++	paragraph_formatting.rtf.tex \
++	pict.rtf.tex \
++	symbol.rtf.tex \
++	text_color.rtf.tex \
++	text_formatting.rtf.tex \
++	Turkish.rtf.tex \
++	unicode4.rtf.tex
+ 
+ # need to wipe out test results on make clean
+ CLEANFILES = $(testresults_html) $(testresults_tex) pict001.wmf
diff --git a/debian/patches/series b/debian/patches/series
index 77585ef..b8df39e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@
 0005-Tell-unrtf-where-to-look-for-output-format-config-fi.patch
 0006-Disable-latex-test-latex-output-is-broken.patch
 0007-Get-fully-rid-of-hardcoded-local-lib-paths.patch
+0008-Ensure-that-the-picture-extracted-during-testing-is-.patch
+0009-Update-test-file-set-to-ensure-proper-cleaning-of-te.patch