diff --git a/easymock.spec b/easymock.spec
index 106434f..b917b8f 100644
--- a/easymock.spec
+++ b/easymock.spec
@@ -30,7 +30,7 @@
 
 Name:           easymock
 Version:        1.2
-Release:        11%{?dist}
+Release:        12%{?dist}
 Epoch:          0
 Summary:        Easy mock objects
 Group:          Development/Libraries
@@ -51,7 +51,6 @@ BuildRequires:  ant-junit >= 0:1.6
 BuildRequires:  junit >= 0:3.8.1
 BuildRequires:  java-devel >= 0:1.5.0
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 EasyMock provides Mock Objects for interfaces in JUnit tests by generating
@@ -87,49 +86,49 @@ export CLASSPATH=
 %{ant} -Dbuild.sysclasspath=first
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 unzip -qq %{name}%{version}_Java1.3.zip
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}
 
 install -pm 644 %{name}%{version}_Java1.3/%{name}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar \
   $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr %{name}%{version}_Java1.3/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr %{name}%{version}_Java1.3/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # pom
-install -dm 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/
+install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 %add_to_maven_depmap easymock easymock %{version}_Java1.5 JPP easymock
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 %update_maven_depmap
 
 %postun
 %update_maven_depmap
 
+%pre javadoc
+# workaround for rpm bug 646523 (can be removed in F-17)
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc %{name}%{version}_Java1.3/{Documentation,License}.html
-%{_datadir}/maven2/*
+%{_mavenpomdir}*
 %{_mavendepmapfragdir}/*
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
 
 %files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Nov 26 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2-12
+- Fix pom filename (Resolves rhbz#655795)
+- Remove clean section and buildroot declaration
+- Remove versioned jars and pom files
+
 * Thu Aug 20 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.2-11
 - Bump release for rebuild.