diff --git a/src/main/java/fr/mrcubee/waypoint/WayPointPlugin.java b/src/main/java/fr/mrcubee/waypoint/WayPointPlugin.java
index 2f1e117..6547a32 100644
--- a/src/main/java/fr/mrcubee/waypoint/WayPointPlugin.java
+++ b/src/main/java/fr/mrcubee/waypoint/WayPointPlugin.java
@@ -4,6 +4,7 @@
 import fr.mrcubee.waypoint.command.GpsCommand;
 import fr.mrcubee.waypoint.command.WaypointCommand;
 import fr.mrcubee.waypoint.listeners.AsyncPlayerChatListener;
+import fr.mrcubee.waypoint.listeners.PlayerDeathListener;
 import fr.mrcubee.waypoint.listeners.PlayerJoinQuitListener;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -38,6 +39,7 @@ public void onEnable() {
         this.gps.runTaskTimerAsynchronously(this, 0L, 5L);
         pluginManager.registerEvents(new AsyncPlayerChatListener(), this);
         pluginManager.registerEvents(new PlayerJoinQuitListener(), this);
+        pluginManager.registerEvents(new PlayerDeathListener(), this);
         getCommand("gps").setExecutor(new GpsCommand());
         getCommand("waypoint").setExecutor(new WaypointCommand());
         for (Player player : Bukkit.getOnlinePlayers())
diff --git a/src/main/java/fr/mrcubee/waypoint/listeners/PlayerDeathListener.java b/src/main/java/fr/mrcubee/waypoint/listeners/PlayerDeathListener.java
new file mode 100644
index 0000000..908b901
--- /dev/null
+++ b/src/main/java/fr/mrcubee/waypoint/listeners/PlayerDeathListener.java
@@ -0,0 +1,19 @@
+package fr.mrcubee.waypoint.listeners;
+
+import fr.mrcubee.langlib.Lang;
+import fr.mrcubee.waypoint.GPS;
+import fr.mrcubee.waypoint.WayPoint;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerRespawnEvent;
+
+public class PlayerDeathListener implements Listener {
+
+    @EventHandler
+    public void event(final PlayerRespawnEvent event) {
+        final String waypointName = Lang.getMessage(event.getPlayer(), "waypoint.death.name", "&cLANG ERROR", true);
+
+        GPS.setLocation(event.getPlayer(), new WayPoint(waypointName, event.getPlayer().getLocation()));
+    }
+
+}
diff --git a/src/main/resources/lang/EN_us.lang b/src/main/resources/lang/EN_us.lang
index 1ea89d4..35f81e3 100644
--- a/src/main/resources/lang/EN_us.lang
+++ b/src/main/resources/lang/EN_us.lang
@@ -18,4 +18,8 @@ gps.command.waypoint.not_exist=&cThe waypoint does not exist.
 waypoint.command.already_exist=&cThe waypoint already exists.
 waypoint.command.not_exist=&cThe waypoint does not exist.
 waypoint.command.created=&aThe &e%s &awaypoint has been created.
-waypoint.command.removed=&aWaypoint &e%s &ahas been deleted.
\ No newline at end of file
+waypoint.command.removed=&aWaypoint &e%s &ahas been deleted.
+
+# Death Waypoint
+
+waypoint.death.name=Last death
\ No newline at end of file
diff --git a/src/main/resources/lang/FR_fr.lang b/src/main/resources/lang/FR_fr.lang
index 87fb798..c8d4f54 100644
--- a/src/main/resources/lang/FR_fr.lang
+++ b/src/main/resources/lang/FR_fr.lang
@@ -18,4 +18,8 @@ gps.command.waypoint.not_exist=&cLe waypoint n'existe pas.
 waypoint.command.already_exist=&cLe waypoint existe déjà.
 waypoint.command.not_exist=&cLe waypoint n'existe pas.
 waypoint.command.created=&aLe waypoint &e%s &aa été créé.
-waypoint.command.removed=&aLe waypoint &e%s &aa été supprimé.
\ No newline at end of file
+waypoint.command.removed=&aLe waypoint &e%s &aa été supprimé.
+
+# Death Waypoint
+
+waypoint.death.name=Dernière mort
\ No newline at end of file