diff --git a/maven-build.properties b/maven-build.properties
index 691fa68..631b241 100644
--- a/maven-build.properties
+++ b/maven-build.properties
@@ -1,8 +1,8 @@
 #Generated by Maven Ant Plugin - DO NOT EDIT THIS FILE!
-#Thu May 24 23:15:55 CEST 2012
+#Thu Nov 29 13:22:48 CET 2012
 bouncycastle.version=1.46
 maven.settings.offline=true
-maven.build.finalName=voms-api-java-2.0.8
+maven.build.finalName=voms-api-java-2.0.9
 maven.build.resourceDir.0=src/main/resources
 maven.build.testOutputDir=${maven.build.dir}/test-classes
 maven.build.testResourceDir.0=src/test/resources
@@ -14,10 +14,9 @@ maven.test.reports=${maven.build.dir}/test-reports
 maven.build.dir=target
 project.build.outputDirectory=${maven.build.outputDir}
 assembly.javadoc.dir=/usr/share/javadoc/voms-api-java
-assembly.doc.dir=/usr/share/doc/voms-api-java-2.0.8
+assembly.doc.dir=/usr/share/doc/voms-api-java-2.0.9
 project.reporting.outputEncoding=UTF-8
 maven.build.testDir.0=src/test/java
 maven.settings.interactiveMode=true
 assembly.java.dir=/usr/share/java
-maven.repo.local=/home/ellert/Fedora-GIT/voms-api-java/voms-api-java-2.0.8/.m2
 maven.build.outputDir=${maven.build.dir}/classes
diff --git a/maven-build.xml b/maven-build.xml
index ac429f2..0bdf221 100644
--- a/maven-build.xml
+++ b/maven-build.xml
@@ -10,7 +10,7 @@
 <!--                                                                        -->
 <!-- Any modifications will be overwritten.                                 -->
 <!--                                                                        -->
-<!-- Generated by Maven Ant Plugin on 5/24/12 11:15 PM                      -->
+<!-- Generated by Maven Ant Plugin on 11/29/12 1:22 PM                      -->
 <!-- See: http://maven.apache.org/plugins/maven-ant-plugin/                 -->
 <!--                                                                        -->
 <!-- ====================================================================== -->
@@ -24,7 +24,7 @@
   <property file="${user.home}/.m2/maven.properties"/>
   <property file="maven-build.properties"/>
 
-  <property name="maven.build.finalName" value="voms-api-java-2.0.8"/>
+  <property name="maven.build.finalName" value="voms-api-java-2.0.9"/>
   <property name="maven.build.dir" value="target"/>
   <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/>
   <property name="maven.build.srcDir.0" value="src/main/java"/>
@@ -56,6 +56,7 @@
     <pathelement location="${maven.repo.local}/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
     <pathelement location="${maven.repo.local}/commons-cli/commons-cli/1.1/commons-cli-1.1.jar"/>
     <pathelement location="${maven.repo.local}/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
+    <pathelement location="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar"/>
   </path>
 
   <!-- ====================================================================== -->
@@ -114,6 +115,9 @@
         <pathelement location="${maven.build.outputDir}"/>
       </classpath>
     </javac>
+    <copy todir="${maven.build.testOutputDir}">
+      <fileset dir="${maven.build.testResourceDir.0}"/>
+    </copy>
   </target>
 
   <!-- ====================================================================== -->
@@ -140,6 +144,7 @@
           <include name="**/*Test.java"/>
           <include name="**/*TestCase.java"/>
           <exclude name="**/*Abstract*Test.java"/>
+          <exclude name="**/TestFixture.java"/>
         </fileset>
       </batchtest>
       <batchtest todir="${maven.test.reports}" if="test">
@@ -240,35 +245,40 @@
           unless="maven.mode.offline">
     <mkdir dir="${maven.repo.local}"/>
     <mkdir dir="${maven.repo.local}/junit/junit/3.8.1"/>
-    <get src="http://repo1.maven.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
+    <get src="http://repo.maven.apache.org/maven2/junit/junit/3.8.1/junit-3.8.1.jar" 
          dest="${maven.repo.local}/junit/junit/3.8.1/junit-3.8.1.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
     <mkdir dir="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1"/>
-    <get src="http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
+    <get src="http://repo.maven.apache.org/maven2/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
          dest="${maven.repo.local}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
     <mkdir dir="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46"/>
-    <get src="http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" 
+    <get src="http://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" 
          dest="${maven.repo.local}/org/bouncycastle/bcprov-jdk16/1.46/bcprov-jdk16-1.46.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
     <mkdir dir="${maven.repo.local}/log4j/log4j/1.2.14"/>
-    <get src="http://repo1.maven.org/maven2/log4j/log4j/1.2.14/log4j-1.2.14.jar" 
+    <get src="http://repo.maven.apache.org/maven2/log4j/log4j/1.2.14/log4j-1.2.14.jar" 
          dest="${maven.repo.local}/log4j/log4j/1.2.14/log4j-1.2.14.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
     <mkdir dir="${maven.repo.local}/commons-cli/commons-cli/1.1"/>
-    <get src="http://repo1.maven.org/maven2/commons-cli/commons-cli/1.1/commons-cli-1.1.jar" 
+    <get src="http://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.1/commons-cli-1.1.jar" 
          dest="${maven.repo.local}/commons-cli/commons-cli/1.1/commons-cli-1.1.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
     <mkdir dir="${maven.repo.local}/commons-lang/commons-lang/2.3"/>
-    <get src="http://repo1.maven.org/maven2/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" 
+    <get src="http://repo.maven.apache.org/maven2/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" 
          dest="${maven.repo.local}/commons-lang/commons-lang/2.3/commons-lang-2.3.jar" 
          usetimestamp="false" 
          ignoreerrors="true"/>
+    <mkdir dir="${maven.repo.local}/commons-io/commons-io/2.0.1"/>
+    <get src="http://repo.maven.apache.org/maven2/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" 
+         dest="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" 
+         usetimestamp="false" 
+         ignoreerrors="true"/>
   </target>
 
 </project>
diff --git a/sources b/sources
index 221b6dc..45ec5c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87ebe9c2f8206ba1a0408efc4bb740d3  voms-api-java-2.0.8.tar.gz
+4152447c620a33d32920d8c10941f410  voms-api-java-2.0.9.tar.gz
diff --git a/voms-api-java.spec b/voms-api-java.spec
index 885e211..4614b75 100644
--- a/voms-api-java.spec
+++ b/voms-api-java.spec
@@ -6,8 +6,8 @@
 %endif
 
 Name:		voms-api-java
-Version:	2.0.8
-Release:	2%{?dist}
+Version:	2.0.9
+Release:	1%{?dist}
 Summary:	Virtual Organization Membership Service Java API
 
 Group:		Development/Libraries
@@ -16,8 +16,8 @@ URL:		http://glite.web.cern.ch/glite/
 #		This source tarball is created from a git checkout:
 #		git clone git://github.com/italiangrid/voms-api-java.git
 #		cd voms-api-java
-#		git archive --format tar --prefix voms-api-java-2.0.8/ 2_0_8 \
-#		  | gzip - > ../voms-api-java-2.0.8.tar.gz
+#		git archive --format tar.gz --prefix voms-api-java-2.0.9/ \
+#		  2_0_9 > ../voms-api-java-2.0.9.tar.gz
 Source0:	%{name}-%{version}.tar.gz
 #		These are build instructions for ant generated from the maven
 #		build instrutions using the maven ant plugin.
@@ -40,8 +40,15 @@ ExcludeArch:	ppc64
 Requires:	java
 Requires:	jpackage-utils
 Requires:	bouncycastle >= 1.39
+%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
+Requires:	apache-commons-cli
+Requires:	apache-commons-io
+Requires:	apache-commons-lang
+%else
 Requires:	jakarta-commons-cli
+Requires:	jakarta-commons-io
 Requires:	jakarta-commons-lang
+%endif
 Requires:	log4j
 
 Provides:	vomsjapi = %{version}-%{release}
@@ -66,8 +73,15 @@ BuildRequires:	ant-junit
 %endif
 
 BuildRequires:	bouncycastle >= 1.39
+%if %{?fedora}%{!?fedora:0} >= 15 || %{?rhel}%{!?rhel:0} >= 7
+BuildRequires:	apache-commons-cli
+BuildRequires:	apache-commons-io
+BuildRequires:	apache-commons-lang
+%else
 BuildRequires:	jakarta-commons-cli
+BuildRequires:	jakarta-commons-io
 BuildRequires:	jakarta-commons-lang
+%endif
 BuildRequires:	log4j
 
 %description
@@ -97,14 +111,14 @@ install -m 644 %SOURCE1 .
 install -m 644 %SOURCE2 .
 install -m 644 %SOURCE3 .
 
-sed -e s/bcprov-ext-jdk16/bcprov-jdk16/ -e s/1.45/1.46/ -i pom.xml
+sed -e s/bcprov-ext-jdk16/bcprov-jdk16/ -i pom.xml
 
 %build
 %if %{maven}
-mvn-rpmbuild install javadoc:aggregate
+mvn-rpmbuild -Dbouncycastle.version=1.46 install javadoc:aggregate
 %else
-export CLASSPATH=$(build-classpath bcprov log4j commons-cli commons-lang)
-ant package javadoc
+export CLASSPATH=$(build-classpath bcprov log4j commons-cli commons-io commons-lang)
+ant -Dbuild.sysclasspath=last package javadoc
 %endif
 
 %install
@@ -137,13 +151,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/%{name}
 %endif
-%doc AUTHORS LICENSE
+%doc AUTHORS LICENSE README.md
 
 %files javadoc
 %defattr(-,root,root,-)
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Nov 29 2012 Mattias Ellert <mattias.ellert@fysast.uu.se> - 2.0.9-1
+- Update to version 2.0.9
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild