diff --git a/icedtea-web.spec b/icedtea-web.spec
index cd105cf..a24a4ca 100644
--- a/icedtea-web.spec
+++ b/icedtea-web.spec
@@ -1,18 +1,24 @@
 %define        origin            openjdk
 %define        buildver          0
 %define        javaver           7
-%define        jppname           java-%{javaver}-%{origin}
+%define        jppname           java-%{javaver}-%{origin}-%{_arch}
 %define        sdkdir            %{jppname}
 %define        jredir            %{jppname}/jre
 %define        jrelnk            jre-%{javaver}-%{origin}
 %define        jrebindir         %{_jvmdir}/%{jredir}/bin
 %define        installdir        %{_jvmdir}/%{jppname}
 
+%define        archbuild         %{_target_cpu}
+%ifarch %{ix86}
 %define        archbuild         i386
+%endif
+%ifarch x86_64
+%define        archbuild         amd64
+%endif
 
 Name:          icedtea-web
 Version:       1.6
-Release:       2mamba
+Release:       3mamba
 Summary:       IcedTea Web Start implementation
 Group:         System/Libraries/Java
 Vendor:        openmamba
@@ -127,6 +133,13 @@ fi
 exit 0
 
 %post
+if [ $1 -ge 1 ]; then
+   # Fix for directory which should be a symlink
+   [ -L %{_jvmdir}/java-%{javaver}-%{origin} ] || {
+      mv %{_jvmdir}/java-%{javaver}-%{origin} %{_jvmdir}/java-%{javaver}-%{origin}.bak
+	  ln -sf %{jppname} %{_jvmdir}/java-%{javaver}-%{origin}
+   }
+fi
 
   [ -L /usr/bin/javaws -a "`readlink /usr/bin/javaws`" != "/etc/alternatives/javaws" ] &&
     rm -f /usr/bin/javaws 2>/dev/null
@@ -210,19 +223,13 @@ fi
 %defattr(-,root,root)
 %{_jvmdir}/%{sdkdir}/bin/itweb-settings
 %{_jvmdir}/%{sdkdir}/bin/javaws
-#%{_jvmdir}/%{sdkdir}/bin/pluginappletviewer
 %{jrebindir}/itweb-settings
 %{jrebindir}/javaws
 %dir %{_datadir}/icedtea-web
 %{_datadir}/icedtea-web/*
-#%{_jvmdir}/%{jredir}/lib/about.jar
-#%{_jvmdir}/%{jredir}/lib/about.jnlp
-#%{_jvmdir}/%{jredir}/lib/netx.jar
-#%{_jvmdir}/%{jredir}/lib/plugin.jar
-%{_jvmdir}/java-%{javaver}-openjdk/bin/policyeditor
+%{_jvmdir}/%{sdkdir}/bin/policyeditor
 %{_datadir}/applications/itweb-settings.desktop
 %{_datadir}/applications/javaws.desktop
-#%{_datadir}/icons/hicolor/*x*/apps/javaws.png
 %{_datadir}/pixmaps/javaws.png
 %{_mandir}/man1/icedtea-web-plugin.1.gz
 %{_mandir}/man1/icedtea-web.1.gz
@@ -233,19 +240,21 @@ fi
 %lang(de) %{_mandir}/de/man1/*.1*
 %lang(pl) %{_mandir}/pl/man1/*.1*
 %doc AUTHORS COPYING
-#%doc ChangeLog NEWS README plugin/docs
 
 %files plugin
 %defattr(-,root,root)
 %dir %{_libdir}/mozilla/plugins
 %{_libdir}/mozilla/plugins/IcedTeaPlugin.so 
-%{_jvmdir}/java-%{javaver}-openjdk/lib/IcedTeaPlugin.so
+%{_jvmdir}/%{sdkdir}/lib/IcedTeaPlugin.so
 
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/icedtea-web
 
 %changelog
+* Tue Jul 28 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6-3mamba
+- fix java installation dir (add -%{_arch})
+
 * Sun Jul 26 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 1.6-2mamba
 - plugin: remove requirement for java-openjdk-runtime = 7