diff --git a/branches/experimental/gnome-extra/novell-nautilus-plugin/Manifest b/branches/experimental/gnome-extra/novell-nautilus-plugin/Manifest
index 8931fbb..e9fee5b 100644
--- a/branches/experimental/gnome-extra/novell-nautilus-plugin/Manifest
+++ b/branches/experimental/gnome-extra/novell-nautilus-plugin/Manifest
@@ -1,12 +1,13 @@
-DIST novell-client-1.2-SLE10.tar.gz 13963983 RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 SHA1 14278f74c8226afabc0c602bdc31d4e20acff6b9 SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241
-EBUILD novell-nautilus-plugin-1.2.0_p323.ebuild 2564 RMD160 3751cdbf8fa762f8090d26f3d823aa483c7fc7d8 SHA1 d65e0a32a1cf3354b7525a2b62b8d2efa49c62b8 SHA256 63681af8b456ea757f86449813f48e78e55771dbc045b109341764f723d35904
-MD5 0fa56390a0b38f363e8fa802173a6d78 novell-nautilus-plugin-1.2.0_p323.ebuild 2564
-RMD160 3751cdbf8fa762f8090d26f3d823aa483c7fc7d8 novell-nautilus-plugin-1.2.0_p323.ebuild 2564
-SHA256 63681af8b456ea757f86449813f48e78e55771dbc045b109341764f723d35904 novell-nautilus-plugin-1.2.0_p323.ebuild 2564
+DIST Novell_Client_SLED10-i386-2007531-CD1.iso 10256384 RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 SHA1 96d1df5bce5f0afb0a625084226fb347728fcffb SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf
+DIST Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352 RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa SHA1 0430885f18e803bba63ec264022589c4d934ef03 SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806
+EBUILD novell-nautilus-plugin-2.0.421_p3-r1.ebuild 3086 RMD160 065973ec2942d259f21690b6453cf9b1b8d88071 SHA1 47a831d3536bbdc575c4eb8074e468b7af9603b9 SHA256 383b1443991b9995670dd2d155fdd1c16475db430dd96f9b182e1b26618eb38c
+MD5 33313b35a89bc7712ed7bd8c457de25d novell-nautilus-plugin-2.0.421_p3-r1.ebuild 3086
+RMD160 065973ec2942d259f21690b6453cf9b1b8d88071 novell-nautilus-plugin-2.0.421_p3-r1.ebuild 3086
+SHA256 383b1443991b9995670dd2d155fdd1c16475db430dd96f9b182e1b26618eb38c novell-nautilus-plugin-2.0.421_p3-r1.ebuild 3086
 MISC ChangeLog 273 RMD160 66b06b841f1bd7a007e76b5d69d7421627a125e6 SHA1 2c241591b6848f4f6259f60c3912f031d54ffdb2 SHA256 19ad83948c188af386d50278c1a2b82f60e8aad421b15c44e4e1e1ebf054d680
 MD5 596c7a3956143934ac89f65f96166965 ChangeLog 273
 RMD160 66b06b841f1bd7a007e76b5d69d7421627a125e6 ChangeLog 273
 SHA256 19ad83948c188af386d50278c1a2b82f60e8aad421b15c44e4e1e1ebf054d680 ChangeLog 273
-MD5 dcdc80c8269e53d3a5ecd72aa4034a06 files/digest-novell-nautilus-plugin-1.2.0_p323 277
-RMD160 4767389e6f47ba8fb5b8907a954b9f80ce106b78 files/digest-novell-nautilus-plugin-1.2.0_p323 277
-SHA256 aa21d5b182ad571f4bedf0694cc608f211146d09e0af2bdd1addd6415a2bf0b8 files/digest-novell-nautilus-plugin-1.2.0_p323 277
+MD5 ec699dae9428f5ecd71e3b6fdc0b8405 files/digest-novell-nautilus-plugin-2.0.421_p3-r1 626
+RMD160 a08fca1bf3e2cb25ea5b9fb70f27de63c0e9974a files/digest-novell-nautilus-plugin-2.0.421_p3-r1 626
+SHA256 d20395db16f0e2a59b7411ac9ea0817b657bd9804d54da40d459a518a13b5153 files/digest-novell-nautilus-plugin-2.0.421_p3-r1 626
diff --git a/branches/experimental/gnome-extra/novell-nautilus-plugin/files/digest-novell-nautilus-plugin-2.0.421_p3 b/branches/experimental/gnome-extra/novell-nautilus-plugin/files/digest-novell-nautilus-plugin-2.0.421_p3
deleted file mode 100644
index 9702858..0000000
--- a/branches/experimental/gnome-extra/novell-nautilus-plugin/files/digest-novell-nautilus-plugin-2.0.421_p3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2aab6c7358a733d1d8d9a4e893500a36 novell-client-1.2-SLE10.tar.gz 13963983
-RMD160 98a0aa1ecd9c4f36c158fa2cce77f51927d2f693 novell-client-1.2-SLE10.tar.gz 13963983
-SHA256 ddf55b7a757a4f4e104c4aefb04639f4022d43c31171d0a914d1b765d6e78241 novell-client-1.2-SLE10.tar.gz 13963983
diff --git a/branches/experimental/gnome-extra/novell-nautilus-plugin/files/digest-novell-nautilus-plugin-2.0.421_p3-r1 b/branches/experimental/gnome-extra/novell-nautilus-plugin/files/digest-novell-nautilus-plugin-2.0.421_p3-r1
new file mode 100644
index 0000000..3dc529b
--- /dev/null
+++ b/branches/experimental/gnome-extra/novell-nautilus-plugin/files/digest-novell-nautilus-plugin-2.0.421_p3-r1
@@ -0,0 +1,6 @@
+MD5 476f30aa3db4de7b884b2085f89b837b Novell_Client_SLED10-i386-2007531-CD1.iso 10256384
+RMD160 5296935f1b2b5cb0796b685f5c6bacd532f49094 Novell_Client_SLED10-i386-2007531-CD1.iso 10256384
+SHA256 3433f30fed62339de2fe12426e4e4e064ec4823073d2271531d7a1009f9cdecf Novell_Client_SLED10-i386-2007531-CD1.iso 10256384
+MD5 94c4812cfd6400e3e9360de01cb9d304 Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352
+RMD160 9b5a8704e518ac7ce1d9d03a890e77a67610cbaa Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352
+SHA256 f170dad7e9774d6b55186228f0ed3de512b09255d5d19f54e86964a327b62806 Novell_Client_SLED10-x86_64-2007531-CD1.iso 11108352
diff --git a/branches/experimental/gnome-extra/novell-nautilus-plugin/novell-nautilus-plugin-2.0.421_p3.ebuild b/branches/experimental/gnome-extra/novell-nautilus-plugin/novell-nautilus-plugin-2.0.421_p3-r1.ebuild
similarity index 63%
rename from branches/experimental/gnome-extra/novell-nautilus-plugin/novell-nautilus-plugin-2.0.421_p3.ebuild
rename to branches/experimental/gnome-extra/novell-nautilus-plugin/novell-nautilus-plugin-2.0.421_p3-r1.ebuild
index d9eff71..2e6d6d1 100644
--- a/branches/experimental/gnome-extra/novell-nautilus-plugin/novell-nautilus-plugin-2.0.421_p3.ebuild
+++ b/branches/experimental/gnome-extra/novell-nautilus-plugin/novell-nautilus-plugin-2.0.421_p3-r1.ebuild
@@ -9,11 +9,12 @@ MY_PV="${PV/_p/-}"
 
 DESCRIPTION="Novell Network Nautilus Plugin"
 HOMEPAGE="http://www.novell.com"
-SRC_URI="http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/2JyMn7sWP_Q~/novell-client-1.2-SLE10.tar.gz"
+SRC_URI="x86? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/21a91ftmUKk~/Novell_Client_SLED10-i386-2007531-CD1.iso )
+        amd64? ( http://${NOVELL_ACCOUNT_USERNAME}:${NOVELL_ACCOUNT_PASSWORD}@cdn.novell.com/prot/21a91ftmUKk~/Novell_Client_SLED10-x86_64-2007531-CD1.iso )"
 
 LICENSE="Novell-NCL"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="~x86 ~amd64"
 IUSE="gtk linguas_cs_CZ linguas_de_DE linguas_en_US linguas_es_ES linguas_fr_FR linguas_hu_HU linguas_it_IT linguas_ja_JP linguas_pl_PL linguas_pt_BR linguas_ru_RU linguas_sk_SK linguas_zh_CN linguas_zh_TW"
 
 DEPEND=""
@@ -28,13 +29,13 @@ RDEPEND="virtual/libc
 	>=gnome-base/libbonobo-2.10.1
 	>=gnome-base/nautilus-2.12.2
 	>=gnome-base/orbit-2.12.14
-	>=kde-misc/novell-ui-base-1.2.0_p323
+	>=kde-misc/novell-ui-base-2.0.421_p3-r1
 	>=media-libs/fontconfig-2.3.94
 	>=media-libs/freetype-2.1.10
 	>=media-libs/glitz-0.4.4
 	>=media-libs/libpng-1.2.8
 	>=net-libs/openslp-1.2.0
-	>=sys-libs/novell-xplatlib-1.0.2_p5
+	>=sys-libs/novell-xplatlib-1.0.3_p21-r1
 	>=x11-libs/cairo-1.0.2
 	>=x11-libs/gtk+-2.8.10
 	>=x11-libs/libICE-1.0
@@ -45,13 +46,24 @@ RDEPEND="virtual/libc
 	>=sys-devel/gcc-4.1
 	>=sys-libs/zlib-1.2.3"
 
-RESTRICT="nomirror nostrip"
+RESTRICT="nomirror strip"
 
 src_unpack() {
-	unpack ${A}
-	mkdir -p ${WORKDIR}/${PN}-${MY_PV}
-	cd ${PN}-${MY_PV}
-	rpm_unpack ${WORKDIR}/ncl_build_711/NCL_disk/novell/i586/${PN}-${MY_PV}.code10.i586.rpm
+        cd ${WORKDIR}
+        if use x86
+        then
+            narch=i586
+            nlib=lib
+            7z x ${DISTDIR}/Novell_Client_SLED10-i386-2007531-CD1.iso
+        elif use amd64
+        then
+            narch=x86_64
+            nlib=lib64
+            7z x ${DISTDIR}/Novell_Client_SLED10-x86_64-2007531-CD1.iso
+        fi
+        mkdir -p ${WORKDIR}/${PN}-${MY_PV}
+        cd ${PN}-${MY_PV}
+        rpm_unpack ${WORKDIR}/suse/${narch}/${PN}-2.0.b421-3.${narch}.rpm
 }
 
 src_compile() {
@@ -70,11 +82,11 @@ src_install() {
             fi
         done
 	exeinto ${EXTENSIONDIR}
-	doexe ${WORKDIR}/${PN}-${MY_PV}/opt/gnome/lib/nautilus/extensions-1.0/*
+	doexe ${WORKDIR}/${PN}-${MY_PV}/opt/gnome/${nlib}/nautilus/extensions-1.0/*
 	exeinto ${GNOMEVFSMODDIR}
-	doexe ${WORKDIR}/${PN}-${MY_PV}/opt/gnome/lib/gnome-vfs-2.0/modules/*
+	doexe ${WORKDIR}/${PN}-${MY_PV}/opt/gnome/${nlib}/gnome-vfs-2.0/modules/*
 	exeinto ${GNOMEVFSLIBDIR}
-	doexe ${WORKDIR}/${PN}-${MY_PV}/opt/gnome/lib/*.so
+	doexe ${WORKDIR}/${PN}-${MY_PV}/opt/gnome/${nlib}/*.so
 	insinto /etc/gnome-vfs-2.0/modules
 	doins ${WORKDIR}/${PN}-${MY_PV}/etc/opt/gnome/gnome-vfs-2.0/modules/*
 	dodoc ${WORKDIR}/${PN}-${MY_PV}/usr/share/doc/packages/${PN}/*