diff --git a/felix-osgi-foundation.spec b/felix-osgi-foundation.spec
index c37a6d6..60724bb 100644
--- a/felix-osgi-foundation.spec
+++ b/felix-osgi-foundation.spec
@@ -6,7 +6,7 @@
 
 Name:    felix-osgi-foundation
 Version: 1.2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Felix OSGi Foundation EE Bundle
 
 Group:   Development/Libraries
@@ -14,7 +14,6 @@ License: ASL 2.0
 URL:     http://felix.apache.org
 Source0: http://www.apache.org/dist/felix/%{bundle}-%{version}-project.tar.gz
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires: java-devel >= 1:1.6.0
@@ -44,7 +43,7 @@ Requires:       jpackage-utils
 %description javadoc
 API documentation for %{name}.
 
-%global publicPOM %{_mavenpomdir}/JPP.felix-%{name}.pom
+%global publicPOM %{_mavenpomdir}/JPP.felix-%{bundle}.pom
 
 %prep
 %setup -q -n %{bundle}-%{version}
@@ -58,15 +57,10 @@ mvn-jpp \
   install javadoc:javadoc
 
 %install
-%__rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{felixdir}
 install -m 644 target/%{bundle}-%{version}.jar \
-        %{buildroot}%{felixdir}/%{bundle}-%{version}.jar
-
-(cd %{buildroot}%{felixdir} && for jar in *-%{version}*; \
-    do %__ln_s -f ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+        %{buildroot}%{felixdir}/%{bundle}.jar
 
 %add_to_maven_depmap org.apache.felix %{bundle} %{version} JPP/felix %{bundle}
 
@@ -75,10 +69,8 @@ install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml %{buildroot}%{publicPOM}
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-%__rm -rf target/site/api*
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+%__cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 
 %post
 %update_maven_depmap
@@ -86,8 +78,10 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 %postun
 %update_maven_depmap
 
-%clean
-%__rm -rf %{buildroot}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
 %defattr(-,root,root,-)
@@ -98,10 +92,13 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Dec 13 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.2.0-4
+- Versionless jars & javadocs
+- Fix pom filename (#655800)
+
 * Wed Jun 30 2010 Victor G. Vasilyev <victor.vasilyev@sun.com> 1.2.0-3
 - The javadoc subpackage should have requires on jpackage-utils
 - Use the mavenpomdir macro