diff --git a/src/java/org/formic/ant/TemplateTask.java b/src/java/org/formic/ant/TemplateTask.java
index 276d05c..a2101ec 100644
--- a/src/java/org/formic/ant/TemplateTask.java
+++ b/src/java/org/formic/ant/TemplateTask.java
@@ -29,6 +29,8 @@
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 
+import org.apache.tools.ant.taskdefs.Move;
+
 import org.apache.velocity.VelocityContext;
 
 import org.apache.velocity.app.Velocity;
@@ -68,6 +70,7 @@ public void execute()
     FileReader reader = null;
     FileWriter writer = null;
     try{
+      log("Evaluating template: " + template);
       reader = new FileReader(this.template);
       writer = new FileWriter(this.out);
       VelocityContext context = new VelocityContext(values);
@@ -80,7 +83,12 @@ public void execute()
     }
 
     if (move){
-      out.renameTo(template);
+      Move move = new Move();
+      move.setProject(getProject());
+      move.setTaskName(getTaskName());
+      move.setFile(out);
+      move.setTofile(template);
+      move.execute();
     }
   }