diff --git a/Makefile b/Makefile
index 01d241923961a541018d1ab4c7ca09d62e73f095..e644c29d49da64cb045238506d65d1055ea039c8 100644
--- a/Makefile
+++ b/Makefile
@@ -275,10 +275,15 @@ artemis.jar : $(CLASSES)
             jar xvf $$fileJar; \
             rm -rf META-INF/MANIFEST.MF; \
           done; \
+          for fileJar in ../lib/picard/*.jar; do \
+            jar xvf $$fileJar; \
+            rm -rf META-INF/MANIFEST.MF; \
+          done; \
         fi; \
 	cp -R ../lib/LICENSE.Apache ../uk ../nsdb ../type ../seqdb ../etc ../images ../lib/j2ssh/j2ssh.properties \
 	      ../images/PSUlogo.gif ../images/icon.gif ../images/helix.gif ../images/sanger-centre.gif ../README ../artemis_sqlmap .
 	find jar_build -name '*.java' -print | xargs rm -f
+	find jar_build -name '.svn' -print | xargs rm -rf
 	cd jar_build; \
 	rm -rf META-INF/MANIFEST.MF; \
 	echo "Main-Class: uk.ac.sanger.artemis.components.ArtemisMain" > manifest-art; \