diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index e1c37d5..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: clojure
-# $Id$
-NAME := clojure
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/clojure-1.0.0-no_classpath.patch b/clojure-1.0.0-no_classpath.patch
new file mode 100644
index 0000000..479c3ba
--- /dev/null
+++ b/clojure-1.0.0-no_classpath.patch
@@ -0,0 +1,18 @@
+--- richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml.no_classpath	2009-05-04 19:23:20.000000000 -0400
++++ richhickey-clojure-f85444e6f890eb585e598efefdbd84727427e0a4/build.xml	2009-09-29 06:39:34.151649990 -0400
+@@ -104,7 +104,6 @@
+       </fileset>
+       <manifest>
+         <attribute name="Main-Class" value="clojure.main"/>
+-        <attribute name="Class-Path" value="."/>
+       </manifest>
+     </jar>
+     <copy file="${clojure_jar}" tofile="${clojure_noversion_jar}" />
+@@ -122,7 +121,6 @@
+       </fileset>
+       <manifest>
+         <attribute name="Main-Class" value="clojure.main"/>
+-        <attribute name="Class-Path" value="."/>
+       </manifest>
+     </jar>
+     <copy file="${slim_jar}" tofile="${slim_noversion_jar}" />
diff --git a/clojure.spec b/clojure.spec
index e210973..0fdb9fb 100644
--- a/clojure.spec
+++ b/clojure.spec
@@ -1,13 +1,18 @@
+
 Name:           clojure
-Version:     	20090320
-Release:        1%{?dist}
+Epoch:		1
+Version:     	1.0.0
+Release:        5%{?dist}
 Summary:        A dynamic programming language that targets the Java Virtual Machine
 
 Group:          Development/Languages
-License:        CPL
+License:        EPL
 URL:            http://clojure.org/
-Source0:        http://downloads.sourceforge.net/clojure/clojure_%{version}.zip
+Source0:        http://clojure.googlecode.com/files/clojure_%{version}.zip
 Source1:        clojure.sh
+
+Patch1:		clojure-1.0.0-no_classpath.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -32,16 +37,14 @@ optional type hints and type inference, to ensure that calls to Java
 can avoid reflection.
 
 %prep
-%setup -q -c -n clojure-%{version}
-cd clojure
+%setup -q -c -n clojure
 rm -f *.jar
+%patch1 -p1
 
 %build
-cd clojure
 ant jar
 
 %install
-cd clojure
 rm -rf %{buildroot}
 
 # prefix install
@@ -57,20 +60,47 @@ cp clojure.jar %{buildroot}%{_javadir}/%{name}.jar
 install -d -m 755 %{buildroot}%{_bindir}
 cp %{SOURCE1} %{buildroot}%{_bindir}/clojure
 
+install -d %{buildroot}%{_datadir}/maven2/poms
+%add_to_maven_depmap clojure clojur-lang %{version} JPP/%{name} clojure-lang
+install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-clojure-lang.pom
+
 %clean
 rm -rf %{buildroot}
 
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
 
 %files
 %defattr(-,root,root,-)
-%doc clojure/readme.txt
+%doc readme.txt epl-v10.html
 
 %attr(0755,root,root) %{_bindir}/clojure
 %{_javadir}/%{name}.jar
 %{_datadir}/%{name}
 %{_bindir}/clojure
+%{_datadir}/maven2/poms
+%{_mavendepmapfragdir}/*
 
 %changelog
+* Wed Dec  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 1:1.0.0-5
+- Installing maven pom file
+
+* Wed Dec  2 2009 Jochen Schmitt <Jochen herr-schmitt de> 1:1.0.0-3
+- Add Epoch to get proper EVR path
+
+* Tue Dec  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.0-2
+- Forgot uploading soruces
+
+* Tue Dec  1 2009 Jochen Schmitt <Jochen herr-schmitt de> 1.0.0-1
+- New upstream release
+- change license tag to EPL
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 20090320-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Mar 20 2009 Colin Walters <walters@verbum.org> - 20090320
 - New upstream
 
diff --git a/import.log b/import.log
deleted file mode 100644
index a5afd3b..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-clojure-20080916-1_fc10:HEAD:clojure-20080916-1.fc10.src.rpm:1224772058
diff --git a/sources b/sources
index 1344bd3..1fe2edf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0bbd1f6f889dded06ce0fe18381f150c  clojure_20090320.zip
+e7a50129040df7fe52287006988ecbb2  clojure_1.0.0.zip