diff --git a/ChangeLog b/ChangeLog
index 7424fa5e1..34c4dc724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jun  3 23:37:50 CEST 2008 (tk)
+----------------------------------
+  * test: add clam.mail, clam.ppt and clam.tnef (bb#902)
+
 Tue Jun  3 19:41:34 CEST 2008 (tk)
 ----------------------------------
   * clamd/thrmgr.c: move some msgs to debug (bb#1028)
diff --git a/test/.split/split.clam.mailaa b/test/.split/split.clam.mailaa
new file mode 100644
index 000000000..648b31caf
--- /dev/null
+++ b/test/.split/split.clam.mailaa
@@ -0,0 +1,21 @@
+From: ClamAV
+To: ClamAV
+Subject: ClamAV Test File
+Message-ID: <20080603232833.1aeaf8f1@ClamAV>
+Organization: ClamAV
+Mime-Version: 1.0
+Content-Type: multipart/mixed; boundary="MP_/6OvrPH9HEPZRUCVu6uT=Fey"
+
+--MP_/6OvrPH9HEPZRUCVu6uT=Fey
+Content-Type: text/plain; charset=US-ASCII
+Content-Transfer-Encoding: 7bit
+Content-Disposition: inline
+
+This is a ClamAV test file with embedded clam.exe
+--MP_/6OvrPH9HEPZRUCVu6uT=Fey
+Content-Type: application/x-ms-dos-executable; name=clam.exe
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=clam.exe
+
+TVpQAAIAAAAEAA8A//8AALgAAAAhAAAAQAAaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAEAALtxEEAAM8BQUIvzU1
\ No newline at end of file
diff --git a/test/.split/split.clam.mailab b/test/.split/split.clam.mailab
new file mode 100644
index 000000000..75ae0db83
--- /dev/null
+++ b/test/.split/split.clam.mailab
@@ -0,0 +1,11 @@
+NQsClAMARmrHn5ujEAeA2tUP9mcA4fvjEA6eX/tAnNIbRMzSFi
+DAoBAnB2FwIeTgwEL9rMEAAAAAAAAAAAAAAAAAAAwBAAAIAQAAAAAAAAAAAAAAAAAADaEAAA9BAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAS0VSTkVMMzIuRExMAABFeGl0UHJvY2VzcwBVU0VSMzIuRExM
+AENMQU1lc3NhZ2VCb3hBAOYQAAAAAAAAPz8/P1BFAABMAQEAYUNhQgAAAAAAAAAA4ACOgQsBAhkA
+BAAAAAYAAAAAAABAEAAAABAAAEAAAAAAAEAAABAAAAACAAABAAAAAAAAAAMACgAAAAAAACAAAAAE
+AAAAAAAAAgAAAAAAEAAAIAAAAAAQAAAQAAAAAAAAEAAAAAAAAAAAAAAAhBAAAIAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAW0NMQU1BVl0A
+EAAAABAAAAACAAABAAAAAAAAAAAAAAAAAAAAAAAAwA==
+
+--MP_/6OvrPH9HEPZRUCVu6uT=Fey--
diff --git a/test/.split/split.clam.pptaa b/test/.split/split.clam.pptaa
new file mode 100644
index 000000000..879c9c202
Binary files /dev/null and b/test/.split/split.clam.pptaa differ
diff --git a/test/.split/split.clam.pptab b/test/.split/split.clam.pptab
new file mode 100644
index 000000000..ddf681c7d
Binary files /dev/null and b/test/.split/split.clam.pptab differ
diff --git a/test/.split/split.clam.tnefaa b/test/.split/split.clam.tnefaa
new file mode 100644
index 000000000..f2374f50b
Binary files /dev/null and b/test/.split/split.clam.tnefaa differ
diff --git a/test/.split/split.clam.tnefab b/test/.split/split.clam.tnefab
new file mode 100644
index 000000000..8111a207f
Binary files /dev/null and b/test/.split/split.clam.tnefab differ
diff --git a/test/Makefile.am b/test/Makefile.am
index 651e64947..60de8e3d3 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,8 @@
 FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe.bz2 clam.exe clam.zip \
 	clam.arj clam.exe.rtf clam.exe.szdd clam.tar.gz clam.chm clam.sis \
 	clam-aspack.exe clam-pespin.exe clam-upx.exe clam-fsg.exe clam-mew.exe\
-	clam-nsis.exe clam-petite.exe clam-upack.exe clam-wwpack.exe clam.pdf
+	clam-nsis.exe clam-petite.exe clam-upack.exe clam-wwpack.exe clam.pdf\
+	clam.mail clam.ppt clam.tnef
 
 SPLIT_DIR=$(top_srcdir)/test/.split
 
diff --git a/test/Makefile.in b/test/Makefile.in
index a2104acf5..ab185fc84 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -176,7 +176,8 @@ top_srcdir = @top_srcdir@
 FILES = clam-v2.rar clam-v3.rar clam.cab clam.exe.bz2 clam.exe clam.zip \
 	clam.arj clam.exe.rtf clam.exe.szdd clam.tar.gz clam.chm clam.sis \
 	clam-aspack.exe clam-pespin.exe clam-upx.exe clam-fsg.exe clam-mew.exe\
-	clam-nsis.exe clam-petite.exe clam-upack.exe clam-wwpack.exe clam.pdf
+	clam-nsis.exe clam-petite.exe clam-upack.exe clam-wwpack.exe clam.pdf\
+	clam.mail clam.ppt clam.tnef
 
 SPLIT_DIR = $(top_srcdir)/test/.split
 EXTRA_DIST = .split