diff --git a/main/settings/src/main/scala/sbt/std/TaskMacro.scala b/main/settings/src/main/scala/sbt/std/TaskMacro.scala
index e004c3f6b..94b4a562d 100644
--- a/main/settings/src/main/scala/sbt/std/TaskMacro.scala
+++ b/main/settings/src/main/scala/sbt/std/TaskMacro.scala
@@ -308,7 +308,7 @@ object TaskMacro
 				qual.foreach(checkQual)
 				val vd = util.freshValDef(tpe, qual.symbol) // val $x: <tpe>
 				result = Some( (qual, tpe, vd) )
-				val tree = util.refVal(vd) // $x
+				val tree = util.refVal(vd, qual.pos) // $x
 				tree.setPos(qual.pos) // position needs to be set so that wrapKey passes the position onto the wrapper
 				assert(tree.tpe != null, "Null type: " + tree)
 				tree.setType(tpe)
diff --git a/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala b/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
index 48dd32466..dffc5e0c6 100644
--- a/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
+++ b/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
@@ -144,11 +144,12 @@ final class ContextUtil[C <: Context](val ctx: C)
 	}
 
 	/** Create a Tree that references the `val` represented by `vd`. */
-	def refVal(vd: ValDef): Tree =
+	def refVal(vd: ValDef, pos: Position): Tree =
 	{
 		val t = Ident(vd.name)
 		assert(vd.tpt.tpe != null, "val type is null: " + vd + ", tpt: " + vd.tpt.tpe)
 		t.setType(vd.tpt.tpe)
+		t.setPos(pos)
 		t
 	}
 
diff --git a/util/appmacro/src/main/scala/sbt/appmacro/Instance.scala b/util/appmacro/src/main/scala/sbt/appmacro/Instance.scala
index 3e8b45cf0..5928df8bc 100644
--- a/util/appmacro/src/main/scala/sbt/appmacro/Instance.scala
+++ b/util/appmacro/src/main/scala/sbt/appmacro/Instance.scala
@@ -162,7 +162,7 @@ object Instance
 			qual.foreach(checkQual)
 			val vd = util.freshValDef(tpe, qual.symbol)
 			inputs ::= new Input(tpe, qual, vd)
-			util.refVal(vd)
+			util.refVal(vd, qual.pos)
 		}
 		def sub(name: String, tpe: Type, qual: Tree): Converted[c.type] =
 		{