diff --git a/klippy/gcode.py b/klippy/gcode.py
index c66008a71..3c545f684 100644
--- a/klippy/gcode.py
+++ b/klippy/gcode.py
@@ -144,6 +144,7 @@ class GCodeParser:
             'homing_xpos': self.homing_position[0],
             'homing_ypos': self.homing_position[1],
             'homing_zpos': self.homing_position[2],
+            'gcode_position': homing.Coord(*move_position),
             'action_respond_info': self._action_respond_info,
             'action_respond_error': self._action_respond_error,
             'action_emergency_stop': self._action_emergency_stop,
diff --git a/klippy/homing.py b/klippy/homing.py
index ea8967b4d..f6f7e5d8c 100644
--- a/klippy/homing.py
+++ b/klippy/homing.py
@@ -1,9 +1,9 @@
 # Code for state tracking during homing operations
 #
-# Copyright (C) 2016,2017  Kevin O'Connor <kevin@koconnor.net>
+# Copyright (C) 2016-2019  Kevin O'Connor <kevin@koconnor.net>
 #
 # This file may be distributed under the terms of the GNU GPLv3 license.
-import logging, math
+import logging, math, collections
 
 HOMING_STEP_DELAY = 0.00000025
 HOMING_START_DELAY = 0.001
@@ -152,3 +152,5 @@ class EndstopError(Exception):
 def EndstopMoveError(pos, msg="Move out of range"):
     return EndstopError("%s: %.3f %.3f %.3f [%.3f]" % (
             msg, pos[0], pos[1], pos[2], pos[3]))
+
+Coord = collections.namedtuple('Coord', ('x', 'y', 'z', 'e'))
diff --git a/klippy/toolhead.py b/klippy/toolhead.py
index b7413fb1f..713b0009c 100644
--- a/klippy/toolhead.py
+++ b/klippy/toolhead.py
@@ -417,6 +417,7 @@ class ToolHead:
             status = "Ready"
         return { 'status': status, 'print_time': print_time,
                  'estimated_print_time': estimated_print_time,
+                 'position': homing.Coord(*self.commanded_pos),
                  'printing_time': print_time - last_print_start_time }
     def _handle_request_restart(self, print_time):
         self.motor_off()