diff --git a/changelog b/changelog
index b97c8947e96..d1a6b606608 100644
--- a/changelog
+++ b/changelog
@@ -44,6 +44,7 @@ Version 1.5.4+svn:
    * New command, [store_time_of_day], makes it possible to store ToD info
      in a WML array/container.
    * Changed underlying_id in unit to be unique number
+   * New command, [end_turn], ends the current side's turn.
  * AI
    * Made it possible to use formula AI for recruiting when using default ai
    * Changed defaults for AI parameters: village_value, villages_per_scout,
diff --git a/data/scenario-test.cfg b/data/scenario-test.cfg
index 22f673e4cd1..7213c2b7dfc 100644
--- a/data/scenario-test.cfg
+++ b/data/scenario-test.cfg
@@ -669,6 +669,10 @@ Xu          , Xu          , Qxu         , Qxu         , Ql          , Ql
         x,y=9,3
         text="Win"
     [/label]
+    [label]
+        x,y=7,3
+        text="Timeshift"
+    [/label]
 
     [label]
         x,y=14,9
@@ -699,6 +703,15 @@ Xu          , Xu          , Qxu         , Qxu         , Ql          , Ql
             variable=endlevel_test
         [/insert_tag]
     [/event]
+    [event]
+        name="moveto"
+        first_time_only=no
+        [filter]
+            x,y=7,3
+        [/filter]
+        [end_turn]
+        [/end_turn]
+    [/event]
 
     [event]
         name=prestart
diff --git a/src/game_events.cpp b/src/game_events.cpp
index 292d7ab6d2d..7d074cee1c7 100644
--- a/src/game_events.cpp
+++ b/src/game_events.cpp
@@ -2555,6 +2555,11 @@ namespace {
 		}
 	}
 
+	WML_HANDLER_FUNCTION(end_turn,/*handler*/,/*event_info*/,cfg)
+	{
+		throw end_turn_exception();
+	}
+
 	WML_HANDLER_FUNCTION(endlevel,/*handler*/,/*event_info*/,cfg)
 	{
 		// Remove 0-hp units from the unit map to avoid the following problem: