diff --git a/emma.spec b/emma.spec
index 9411713..8fe136d 100644
--- a/emma.spec
+++ b/emma.spec
@@ -28,15 +28,17 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define shortver 2.0
+
 Summary:        Code Coverage Tool
 Name:           emma
-Version:        2.0
-Release:        0.5312.2jpp.4%{?dist}
+Version:        %{shortver}.5312
+Release:        1%{?dist}
 Epoch:          0
 Group:          Development/Tools
 License:        CPL
 URL:            http://emma.sourceforge.net/
-Source0:        emma-2.0.5312-src.zip
+Source0:        http://downloads.sourceforge.net/emma/%{name}-%{version}-src.zip
 Source1:        emma-2.0.5312.pom
 Source2:        emma_ant-2.0.5312.pom
 # These are hacks until we get the source for the timestamping class
@@ -81,7 +83,7 @@ Group:          Documentation
 %{summary}.
 
 %prep
-%setup -q -n %{name}-%{version}.5312
+%setup -q
 cp -p %{SOURCE3} .
 cp -p %{SOURCE4} .
 
@@ -102,13 +104,13 @@ ant -Dbuild.compiler=modern build javadoc
 rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 dist/%{name}.jar \
-               $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+               $RPM_BUILD_ROOT%{_javadir}/%{name}-%{shortver}.jar
 install -m 644 dist/%{name}_ant.jar \
-               $RPM_BUILD_ROOT%{_javadir}/%{name}_ant-%{version}.jar
+               $RPM_BUILD_ROOT%{_javadir}/%{name}_ant-%{shortver}.jar
 %add_to_maven_depmap emma emma %{version} JPP %{name}
 %add_to_maven_depmap emma emma_ant %{version} JPP %{name}_ant
 
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{shortver}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{shortver}||g"`; done)
 
 # poms
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -142,6 +144,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}*
 
 %changelog
+* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.0.5312-1
+- drop repotag
+- fix version, release to be sane
+
 * Mon Jul 07 2008 Andrew Overholt <overholt@redhat.com> 2.0-0.5312.2jpp.4
 - Remove requirement on maven2 as jpackage-utils now owns the maven POMs
   and fragments directories.