diff --git a/josm b/josm
index 568c2e9..30b7b35 100644
--- a/josm
+++ b/josm
@@ -1,4 +1,21 @@
 #!/bin/sh
 # Simple wrapper script used to start JOSM
 
-java $JAVA_OPTS -jar /usr/share/java/josm.jar "$@"
+# Source functions library
+if [ -f /usr/share/java-utils/java-functions ] ; then
+  . /usr/share/java-utils/java-functions
+else
+  echo "Can't find functions library, aborting"
+  exit 1
+fi
+
+# Configuration
+MAIN_CLASS="JOSM"
+BASE_JARS="josm metadata-extractor ant"
+
+# Set parameters
+set_classpath $BASE_JARS
+
+# Let's start
+run "$@"
+
diff --git a/josm-0-bzip2.patch b/josm-0-bzip2.patch
deleted file mode 100644
index 1cd5dd0..0000000
--- a/josm-0-bzip2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build.xml.origine	2010-06-18 07:19:08.494841000 +0200
-+++ build.xml	2010-06-18 07:20:34.369841100 +0200
-@@ -54,6 +54,8 @@
- 
- 			<!-- All jar files necessary to run only JOSM (no tests) -->
- 			<zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
-+			<zipfileset src="/usr/share/java/ant.jar" />
-+			<zipfileset src="/usr/share/java/commons-codec.jar" />
- 		</jar>
- 	</target>
- 
diff --git a/josm-0-remove_metadata-extractor.patch b/josm-0-remove_metadata-extractor.patch
new file mode 100644
index 0000000..de5df12
--- /dev/null
+++ b/josm-0-remove_metadata-extractor.patch
@@ -0,0 +1,12 @@
+--- build.xml.origine	2010-06-22 20:15:14.253810000 +0200
++++ build.xml	2010-06-22 20:16:36.211934671 +0200
+@@ -96,9 +96,6 @@ Build-Date: ${build.tstamp}
+ 			</manifest>
+ 			<zipfileset dir="images" prefix="images" />
+ 			<zipfileset dir="data" prefix="data" />
+-
+-			<!-- All jar files necessary to run only JOSM (no tests) -->
+-			<zipfileset src="lib/metadata-extractor-2.3.1-nosun.jar" />
+ 		</jar>
+ 	</target>
+ 
diff --git a/josm.spec b/josm.spec
index 7859fd6..645c712 100644
--- a/josm.spec
+++ b/josm.spec
@@ -6,7 +6,7 @@
 
 Name:           josm
 Version:        0
-Release:        0.7.%{svn_revision}svn%{?dist}
+Release:        0.8.%{svn_revision}svn%{?dist}
 Summary:        An editor for  OpenStreetMap (OSM)
 Group:          Applications/Internet
 License:        GPLv2+
@@ -25,8 +25,8 @@ Patch0:         %{name}-%{version}-disable_oauth.patch
 #patch to add javadoc generation in build.xml
 Patch1:         %{name}-%{version}-add_javadoc.patch
 
-#patch to use ant.jar (for bzip2) and commons-codec
-Patch2:         %{name}-%{version}-bzip2.patch
+#patch to remove metadata-extractor of final jar
+Patch2:         %{name}-%{version}-remove_metadata-extractor.patch
 
 #remove call to "svn info" and fix in build.xml revision and commit date 
 Patch3:         %{name}-%{version}-remove_svn_call.patch 
@@ -38,7 +38,7 @@ BuildArch:      noarch
 BuildRequires:  jpackage-utils 
 BuildRequires:  desktop-file-utils
 BuildRequires:  ant
-BuildRequires:  jakarta-commons-codec >= 1.3
+#BuildRequires:  jakarta-commons-codec >= 1.3
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  gettext
 BuildRequires:  metadata-extractor >= 2.3.1
@@ -46,6 +46,7 @@ Requires:       java >= 1:1.6.0
 Requires:       jpackage-utils
 Requires:       hicolor-icon-theme
 Requires:       metadata-extractor >= 2.3.1
+Requires:       ant
 
 %description
 JOSM is an editor for OpenStreetMap (OSM) written in Java 
@@ -143,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %changelog
 
+* Tue Jun 22 2010 Cedric OLIVIER <cedric.olivier@free.fr> 0-0.8.3329svn
+- According to fedora policies by removing metadata-extractor jar file
+
 * Tue Jun 22 2010 Cedric OLIVIER <cedric.olivier@free.fr> 0-0.7.3329svn
 - Svn revision added in welcom page