diff --git a/maven-scm.spec b/maven-scm.spec
index 38fe1ac..6479e16 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -33,14 +33,14 @@
 
 Name:           maven-scm
 Version:        1.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
 Group:          Development/Libraries
 URL:            http://maven.apache.org/scm
 
-# svn export 
+# svn export
 #   http://svn.apache.org/repos/asf//maven/scm/tags/maven-scm-1.4/ maven-scm-1.4/
 # tar cJf maven-scm-1.4.tar.xz maven-scm-1.4/
 Source0:        %{name}-%{namedversion}.tar.xz
@@ -57,8 +57,6 @@ Patch4:         005_maven-scm_fix-vss-provider-pom.patch
 Patch5:         006_maven-scm_fix-vss-provider-java.patch
 
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 0:1.6
@@ -119,7 +117,7 @@ Group:          Documentation
 Javadoc for %{name}.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
@@ -142,33 +140,29 @@ mvn-jpp \
         install javadoc:aggregate
 
 %install
-rm -rf $RPM_BUILD_ROOT
 # jars/poms
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/maven2/poms
 
-# remove test files, they are used for build time testing
-#find  -type f -name "*cvstest*" -exec rm -f '{}' \; \
-#-o -type f -name "*svntest*" -exec rm -f '{}' \;
-
 for jar in `find . -type f -name "*.jar" | grep -E "target/.*.jar$"`; do
-        newname=`basename $jar | sed -e s:^maven-scm-::g`
-        install -pm 644 $jar \
-          $RPM_BUILD_ROOT%{_javadir}/%{name}/$newname
+        newname=`basename $jar`
+        newname=${newname/maven-scm-/}
+        versionless_jar=${newname/-%{version}/}
+        install -pm 644 $jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$versionless_jar
 done
 
 #poms (exclude the svn/cvstest poms. They are unnecessary)
-# ignore 
+# ignore
 #  1) poms in target/ (they are either copies, or temps)
 #  2) poms in src/test/ (they are poms needed for tests only)
 for i in `find . -name pom.xml | grep -v \\\./pom.xml | \
    grep -v target | grep -v src/test`; do
         artifactname=`basename \`dirname $i\``
         jarname=`echo $artifactname | sed -e s:^maven-scm-::g`
-        cp -p $i $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.$artifactname.pom
+        cp -p $i $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.$artifactname.pom
         %add_to_maven_depmap org.apache.maven.scm $artifactname %{namedversion} JPP/%{name} $jarname
 done
-cp -p pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.maven-scm-scm.pom
+cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-scm-scm.pom
 %add_to_maven_depmap org.apache.maven.scm maven-scm %{namedversion} JPP/maven-scm scm
 
 %add_to_maven_depmap org.apache.maven.plugins maven-scm-plugin %{namedversion} JPP/maven-scm plugin
@@ -205,6 +199,11 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/*
 
 %changelog
+* Tue Jan 11 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-5
+- Drop buildroot definition
+- Use mavenpomdir macro
+- Make jars versionless (for real)
+
 * Mon Jan 3 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.4-4
 - Drop tomcat BRs.
 - No more versioned jar and javadoc.