diff --git a/bin/plugin b/bin/plugin
index 80d3e7d2906..c1b5a777042 100755
--- a/bin/plugin
+++ b/bin/plugin
@@ -103,4 +103,6 @@ if [ -e "$CONF_FILE" ]; then
   esac
 fi
 
+export HOSTNAME=`hostname -s`
+
 exec "$JAVA" $JAVA_OPTS $ES_JAVA_OPTS -Xmx64m -Xms16m -Delasticsearch -Des.path.home="$ES_HOME" $properties -cp "$ES_HOME/lib/*" org.elasticsearch.plugins.PluginManager $args
diff --git a/bin/plugin.bat b/bin/plugin.bat
index 462c2d78a07..1addc161323 100644
Binary files a/bin/plugin.bat and b/bin/plugin.bat differ