--- java-1.6.0-sun-compat.spec.org	2009-03-17 10:51:55.000000000 -0600
+++ java-1.6.0-sun-compat.spec	2009-03-17 13:20:15.000000000 -0600
@@ -1,7 +1,7 @@
 %define origin          sun
 %define priority        1603
 %define javaver         1.6.0
-%define buildver        06
+%define buildver        12 
 %define upstreamrel     fcs
 
 %define name            java-%{javaver}-%{origin}-compat
@@ -23,19 +23,24 @@
 %define fontdir         %{_datadir}/fonts/java
 %define xsldir          %{_datadir}/xml/%{name}-%{version}
 
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
 %define has_javaws      1
 %else
 %define has_javaws      0
 %endif
 %define javaws_ver      %{javaver}
 
-%ifarch %{ix86}
+%ifarch %{ix86} x86_64
 %define has_plugin      1
 %else
 %define has_plugin      0
 %endif
+%ifarch x86_64
+%define pluginname      %{_jvmdir}/%{jredir}/lib/amd64/libnpjp2.so
+%endif
+%ifarch %{ix86}
 %define pluginname      %{_jvmdir}/%{jredir}/plugin/i386/ns7/libjavaplugin_oji.so
+%endif
 # Browser packages (comma separated) for which we trigger plugin symlinking.
 %define browserpkgs     mozilla, firefox, mozilla-firefox, opera, seamonkey
 # Dirs where we manage plugin symlinks, no wildcards here.
@@ -346,7 +351,7 @@
 --slave %{_mandir}/man1/unpack200.1$ext    unpack200.1$ext             %{_mandir}/man1/unpack200-%{name}.1$ext \
 %if %{has_javaws}
 --slave %{_mandir}/man1/javaws.1$ext       javaws.1$ext                %{_mandir}/man1/javaws-%{name}.1$ext \
---slave %{_datadir}/javaws                 javaws                      %{_jvmdir}/%{jrelnk}/javaws
+--slave %{_datadir}/javaws                 javaws                      %{jrebindir}/javaws
 %endif
 
 update-alternatives --install %{_jvmdir}/jre-%{origin} jre_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \