diff --git a/make/nashorn/build-benchmark.xml b/make/nashorn/build-benchmark.xml
index 9bc7b4d893e..84f48518e56 100644
--- a/make/nashorn/build-benchmark.xml
+++ b/make/nashorn/build-benchmark.xml
@@ -219,7 +219,8 @@
 
   <target name="-define-nashorn-task">
     <ant dir="${nashorntask.dir}" inheritAll="false"/>
-    <taskdef name="nashorn" classname="jdk.nashorn.ant.NashornTask" classpath="${nashorntask.dir}/dist/nashorntask.jar"/>
+    <taskdef name="nashorn" classname="jdk.nashorn.ant.NashornTask"
+        classpath="${nashorntask.dist.dir}/nashorntask.jar"/>
   </target>
 
   <!--
diff --git a/make/nashorn/buildtools/nashorntask/build.xml b/make/nashorn/buildtools/nashorntask/build.xml
index 612d39db769..cb2c8ce27d2 100644
--- a/make/nashorn/buildtools/nashorntask/build.xml
+++ b/make/nashorn/buildtools/nashorntask/build.xml
@@ -27,18 +27,18 @@
   </target>
 
   <target name="prepare" depends="init">
-    <mkdir dir="${build.classes.dir}"/>
-    <mkdir dir="${dist.dir}"/>
+    <mkdir dir="${nashorntask.build.classes.dir}"/>
+    <mkdir dir="${nashorntask.dist.dir}"/>
   </target>
 
   <target name="clean" depends="init">
-    <delete dir="${build.dir}"/>
-    <delete dir="${dist.dir}"/>
+    <delete dir="${nashorntask.build.dir}"/>
+    <delete dir="${nashorntask.dist.dir}"/>
   </target>
 
   <target name="compile" depends="prepare" description="Compiles the nashorn ant tag sources">
     <javac srcdir="${src.dir}"
-           destdir="${build.classes.dir}"
+           destdir="${nashorntask.build.classes.dir}"
            debug="${javac.debug}"
            includeantruntime="true">
       <compilerarg value="-Xlint:unchecked"/>
@@ -47,7 +47,7 @@
   </target>
 
   <target name="jar" depends="compile" description="Creates nashorntask.jar">
-    <jar jarfile="${dist.jar}" basedir="${build.classes.dir}"/>
+    <jar jarfile="${nashorntask.dist.jar}" basedir="${nashorntask.build.classes.dir}"/>
   </target>
 
   <target name="dist" depends="jar"/>
diff --git a/make/nashorn/buildtools/nashorntask/project.properties b/make/nashorn/buildtools/nashorntask/project.properties
index dde10f7b03c..3032823acb2 100644
--- a/make/nashorn/buildtools/nashorntask/project.properties
+++ b/make/nashorn/buildtools/nashorntask/project.properties
@@ -27,14 +27,14 @@ build.compiler=modern
 javac.source=1.8
 javac.target=1.8
 
-build.classes.dir=${build.dir}/classes
+# This directory is removed when the project is cleaned:
+nashorntask.build.dir=../../../../build/nashorn/nashorntask
+nashorntask.build.classes.dir=${nashorntask.build.dir}/classes
 
 # This directory is removed when the project is cleaned:
-build.dir=build
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/nashorntask.jar
-dist.javadoc.dir=${dist.dir}/javadoc
+nashorntask.dist.dir=${nashorntask.build.dir}/dist
+nashorntask.dist.jar=${nashorntask.dist.dir}/nashorntask.jar
+nashorntask.dist.javadoc.dir=${nashorntask.dist.dir}/javadoc
 
 javac.debug=true
 src.dir=src
diff --git a/make/nashorn/project.properties b/make/nashorn/project.properties
index 6c3e02f0518..d8f4c9ebcb2 100644
--- a/make/nashorn/project.properties
+++ b/make/nashorn/project.properties
@@ -61,6 +61,7 @@ nashorn.override.option=\
 
 # project directory of <nashorn> ant task
 nashorntask.dir=${nashorn.make.dir}/buildtools/nashorntask
+nashorntask.dist.dir=${build.dir}/nashorntask/dist
 
 # nashorn Shell tool
 nashorn.shell.tool=jdk.nashorn.tools.Shell