diff --git a/javamail.spec b/javamail.spec
index 54e1160..e73a32f 100644
--- a/javamail.spec
+++ b/javamail.spec
@@ -94,7 +94,10 @@ for i in mailapi smtp imap gimap pop3 dsn; do
   install -pm 0644 target/release/lib/${i}.jar %{buildroot}%{_javadir}/%{name}/$(get_name ${i}/pom.xml).jar
 done
 install -pm 0644 target/release/lib/mailapi.jar %{buildroot}%{_javadir}/%{name}/$(get_name mailapijar/pom.xml).jar
-(cd %{buildroot}%{_javadir}/%{name} && ln -s javax.mail.jar mail.jar)
+ln -sf javax.mail.jar %{buildroot}%{_javadir}/%{name}/mail.jar
+ln -sf %{name}/javax.mail.jar  %{buildroot}%{_javadir}/javax.mail.jar
+install -d -m 755 %{buildroot}%{_javadir}/javax.mail/
+ln -sf ../%{name}/javax.mail.jar %{buildroot}%{_javadir}/javax.mail/
 
 # poms
 install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
@@ -121,14 +124,12 @@ mkdir -p %{buildroot}%{_javadocdir}
 cp -pr target/release/docs %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}
 
-install -d -m 755 %{buildroot}%{_javadir}/javax.mail/
-ln -sf ../%{name}/javax.mail.jar %{buildroot}%{_javadir}/javax.mail/
-
 %files -f .mfiles
 %doc mail/src/main/java/overview.html
 %license mail/src/main/resources/META-INF/LICENSE.txt
 %{_javadir}/javax.mail
-%{_javadir}/%{name}
+%{_javadir}/javax.mail.jar
+%{_javadir}/%{name}/mail.jar
 
 %files javadoc
 %{_javadocdir}/%{name}