diff --git a/eclipse/src/plugin-resources/templates/classpath.jelly b/eclipse/src/plugin-resources/templates/classpath.jelly
index dd9cf69b..4a3e9fba 100644
--- a/eclipse/src/plugin-resources/templates/classpath.jelly
+++ b/eclipse/src/plugin-resources/templates/classpath.jelly
@@ -244,8 +244,10 @@
     <j:set var="outputDir" value="${maven.eclipse.output.dir}" />
     <j:if test="${empty outputDir}">
       <j:set var="outputDir" value="${maven.build.dest}" />
-      <maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}" separator="/" />
     </j:if>
+
+    <maven:makeRelativePath var="outputDir" basedir="${basedir}" path="${outputDir}" separator="/" />
+
     <classpathentry kind="output" path="${outputDir}" />
     <ant:echo>Setting default output directory to ${outputDir}</ant:echo>
   </classpath>
diff --git a/eclipse/xdocs/changes.xml b/eclipse/xdocs/changes.xml
index e3afced6..bc179012 100644
--- a/eclipse/xdocs/changes.xml
+++ b/eclipse/xdocs/changes.xml
@@ -24,6 +24,7 @@
   </properties>
   <body>
     <release version="1.11" date="in SVN">
+      <action dez="snicoll" type="fix" issue="MPECLIPSE-111">Made output and testOutput directory configuration consistent.</action>
       <action dev="felipeal" type="add" issue="MPECLIPSE-84">Added new property <code>maven.eclipse.project.name</code>.</action>
       <action dev="snicoll" type="add" issue="MPECLIPSE-60">Now trying to download java sources archives from the remote repositories.</action>
     </release>
