diff --git a/mozilla/modules/plugin/tools/sdk/Makefile.in b/mozilla/modules/plugin/tools/sdk/Makefile.in
index 662cccbe13e..af12698ac91 100644
--- a/mozilla/modules/plugin/tools/sdk/Makefile.in
+++ b/mozilla/modules/plugin/tools/sdk/Makefile.in
@@ -28,6 +28,9 @@ include $(DEPTH)/config/autoconf.mk
 
 DIRS = samples
 
+# uncomment NSDISTMODE to make a copy, instead of symlink, all needed files from $(DIST) 
+# NSDISTMODE = copy
+
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
diff --git a/mozilla/modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp b/mozilla/modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp
index ec8f91a786c..eea2397f370 100644
--- a/mozilla/modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp
+++ b/mozilla/modules/plugin/tools/sdk/samples/basic/unix/plugin.cpp
@@ -38,13 +38,14 @@
 #include "plugin.h"
 
 #define MIME_TYPES_HANDLED  "application/basic-plugin"
-#define PLUGIN_NAME         "Basic Example Plugin for Mozilla"
-#define PLUGIN_DESCRIPTION  MIME_TYPES_HANDLED":bsc:"PLUGIN_NAME
+#define PLUGIN_NAME         "Basic Example Plug-in for Mozilla"
+#define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED":bsc:"PLUGIN_NAME
+fine PLUGIN_DESCRIPTION  PLUGIN_NAME " (Plug-ins SDK sample)"
 
 
 char* NPP_GetMIMEDescription(void)
 {
-    return(PLUGIN_DESCRIPTION);
+    return(MIME_TYPES_DESCRIPTION);
 }
 
 /////////////////////////////////////
@@ -59,6 +60,24 @@ void NS_PluginShutdown()
 {
 }
 
+// get values per plugin
+NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
+{
+  NPError err = NPERR_NO_ERROR;
+  switch (aVariable) {
+    case NPPVpluginNameString:
+      *((char **)aValue) = PLUGIN_NAME;
+      break;
+    case NPPVpluginDescriptionString:
+      *((char **)aValue) = PLUGIN_DESCRIPTION;
+      break;
+    default:
+      err = NPERR_INVALID_PARAM;
+      break;
+  }
+  return err;
+}
+
 /////////////////////////////////////////////////////////////
 //
 // construction and destruction of our plugin instance object
@@ -161,15 +180,15 @@ NPError nsPluginInstance::GetValue(NPPVariable aVariable, void *aValue)
   NPError err = NPERR_NO_ERROR;
   switch (aVariable) {
     case NPPVpluginNameString:
-      *((char **)aValue) = PLUGIN_NAME;
-      break;
     case NPPVpluginDescriptionString:
-      *((char **)aValue) = PLUGIN_DESCRIPTION;
+      return NS_PluginGetValue(aVariable, aValue) ;
       break;
     default:
+      err = NPERR_INVALID_PARAM;
       break;
   }
   return err;
+
 }
 
 NPError nsPluginInstance::SetWindow(NPWindow* aWindow)
diff --git a/mozilla/modules/plugin/tools/sdk/samples/common/np_entry.cpp b/mozilla/modules/plugin/tools/sdk/samples/common/np_entry.cpp
index e91e851a4ca..17175dfe1c1 100644
--- a/mozilla/modules/plugin/tools/sdk/samples/common/np_entry.cpp
+++ b/mozilla/modules/plugin/tools/sdk/samples/common/np_entry.cpp
@@ -187,7 +187,7 @@ char * NP_GetMIMEDescription(void)
 
 NPError NP_GetValue(void *future, NPPVariable aVariable, void *aValue)
 {
-  return NPP_GetValue((NPP_t *)future, aVariable, aValue);
+  return NS_PluginGetValue(aVariable, aValue);
 }
 
 #endif //XP_UNIX
diff --git a/mozilla/modules/plugin/tools/sdk/samples/include/pluginbase.h b/mozilla/modules/plugin/tools/sdk/samples/include/pluginbase.h
index 0fd7a9f370f..adeb9189fff 100644
--- a/mozilla/modules/plugin/tools/sdk/samples/include/pluginbase.h
+++ b/mozilla/modules/plugin/tools/sdk/samples/include/pluginbase.h
@@ -88,4 +88,9 @@ void NS_DestroyPluginInstance(nsPluginInstanceBase * aPlugin);
 NPError NS_PluginInitialize();
 void NS_PluginShutdown();
 
+#ifdef XP_UNIX
+// global to get plugins name & description 
+NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue);
+#endif
+
 #endif // __PLUGININSTANCEBASE_H__
diff --git a/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp b/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp
index 902eeeb81a0..b43aaaeee8b 100644
--- a/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp
+++ b/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/plugin.cpp
@@ -46,11 +46,12 @@
 
 #define MIME_TYPES_HANDLED  "application/scriptable-plugin"
 #define PLUGIN_NAME         "Scriptable Example Plugin for Mozilla"
-#define PLUGIN_DESCRIPTION  MIME_TYPES_HANDLED":scr:"PLUGIN_NAME
+#define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED":scr:"PLUGIN_NAME
+#define PLUGIN_DESCRIPTION  PLUGIN_NAME " (Plug-ins SDK sample)"
 
 char* NPP_GetMIMEDescription(void)
 {
-    return(PLUGIN_DESCRIPTION);
+    return(MIME_TYPES_DESCRIPTION);
 }
 
 //////////////////////////////////////
@@ -66,6 +67,25 @@ void NS_PluginShutdown()
 {
 }
 
+// get values per plugin
+NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
+{
+  NPError err = NPERR_NO_ERROR;
+  switch (aVariable) {
+    case NPPVpluginNameString:
+      *((char **)aValue) = PLUGIN_NAME;
+      break;
+    case NPPVpluginDescriptionString:
+      *((char **)aValue) = PLUGIN_DESCRIPTION;
+      break;
+    default:
+      err = NPERR_INVALID_PARAM;
+      break;
+  }
+  return err;
+}
+
+
 /////////////////////////////////////////////////////////////
 //
 // construction and destruction of our plugin instance object
diff --git a/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in b/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in
index 71e4ee2e02c..22f4ffc36a7 100644
--- a/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in
+++ b/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in
@@ -37,7 +37,7 @@ CPPSRCS = nsScriptablePeer.cpp \
 
 XPIDLSRCS = nsISimplePlugin.idl
 
-SHARED_LIBRARY_LIBS = ../common/plugingate_s.$(LIB_SUFFIX)
+SHARED_LIBRARY_LIBS = ../common/$(LIB_PREFIX)plugingate_s.$(LIB_SUFFIX)
 
 ifeq ($(OS_ARCH),WINNT)
 DEFFILE = npsimple.def
diff --git a/mozilla/modules/plugin/tools/sdk/samples/simple/plugin.cpp b/mozilla/modules/plugin/tools/sdk/samples/simple/plugin.cpp
index 10ce21a212e..c8f5a9d1c5e 100644
--- a/mozilla/modules/plugin/tools/sdk/samples/simple/plugin.cpp
+++ b/mozilla/modules/plugin/tools/sdk/samples/simple/plugin.cpp
@@ -48,11 +48,30 @@ nsIServiceManager * gServiceManager = NULL;
 #ifdef XP_UNIX
 #define MIME_TYPES_HANDLED  "application/simple-plugin"
 #define PLUGIN_NAME         "Simple Plugin Example for Mozilla"
-#define PLUGIN_DESCRIPTION  MIME_TYPES_HANDLED"::"PLUGIN_NAME
+#define MIME_TYPES_DESCRIPTION  MIME_TYPES_HANDLED"::"PLUGIN_NAME
+#define PLUGIN_DESCRIPTION  PLUGIN_NAME " (Plug-ins SDK sample)" 
 
 char* NPP_GetMIMEDescription(void)
 {
-    return(PLUGIN_DESCRIPTION);
+    return(MIME_TYPES_DESCRIPTION);
+}
+
+// get values per plugin
+NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue)
+{
+  NPError err = NPERR_NO_ERROR;
+  switch (aVariable) {
+    case NPPVpluginNameString:
+      *((char **)aValue) = PLUGIN_NAME;
+      break;
+    case NPPVpluginDescriptionString:
+      *((char **)aValue) = PLUGIN_DESCRIPTION;
+      break;
+    default:
+      err = NPERR_INVALID_PARAM;
+      break;
+  }
+  return err;
 }
 #endif //XP_UNIX
 
@@ -206,16 +225,6 @@ NPError	nsPluginInstance::GetValue(NPPVariable aVariable, void *aValue)
     }
     break;
 
-#ifdef XP_UNIX
-    // Unix needs some additional cases
-    case NPPVpluginNameString:
-      *((char **)aValue) = PLUGIN_NAME;
-      break;
-    case NPPVpluginDescriptionString:
-      *((char **)aValue) = PLUGIN_DESCRIPTION;
-      break;
-#endif //XP_UNIX
-
     default:
       break;
   }