diff --git a/bin/plugin b/bin/plugin
index d1f0d2328c0..573ea23aafd 100644
--- a/bin/plugin
+++ b/bin/plugin
@@ -28,6 +28,4 @@ else
     JAVA=`which java`
 fi
 
-CLASSPATH=$CLASSPATH:$ES_HOME/lib/*
-
-exec $JAVA -Delasticsearch -Des.path.home="$ES_HOME" -cp $CLASSPATH org.elasticsearch.plugins.PluginManager $*
+exec $JAVA -Delasticsearch -Des.path.home="$ES_HOME" -cp $ES_HOME/lib/* org.elasticsearch.plugins.PluginManager $*
diff --git a/bin/plugin.bat b/bin/plugin.bat
index 3fee09986fe..66216f21b7f 100644
--- a/bin/plugin.bat
+++ b/bin/plugin.bat
@@ -8,10 +8,7 @@ set SCRIPT_DIR=%~dp0
 for %%I in ("%SCRIPT_DIR%..") do set ES_HOME=%%~dpfI
 
 
-set ES_CLASSPATH=%CLASSPATH%;%ES_HOME%/lib/*
-set ES_PARAMS=-Delasticsearch -Des.path.home="%ES_HOME%"
-
-"%JAVA_HOME%\bin\java" %JAVA_OPTS% %ES_JAVA_OPTS% %ES_PARAMS% -cp "%ES_CLASSPATH%" "org.elasticsearch.plugins.PluginManager" %*
+"%JAVA_HOME%\bin\java" -Des.path.home="%ES_HOME%" -cp "%ES_HOME%/lib/*" "org.elasticsearch.plugins.PluginManager" %*
 goto finally