diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt
index 042483ca1..a611b8fda 100644
--- a/CHANGE LOG 1.0.6.1.txt	
+++ b/CHANGE LOG 1.0.6.1.txt	
@@ -9,6 +9,7 @@
 [NEW] Added military flashlight attachments
 [NEW] Added full screen night vision goggles, classname: "NVGoggles_DZE" (must be added to traders by server owners) @icomrade
 [NEW] Added setting to easily disable base takeover and configure which items are removable without ownership or access. See DZE_restrictRemoval in configVariables.sqf. #1886 @AirwavesMan @oiad
+[NEW] Map markers are now automatically tagged with the name of the player who placed them. This can be easily removed or customized by admins. #1871 @looter809
 
 [CHANGED] Turbo and HoldBreath keybindings are now allowed again. @icomrade
 [CHANGED] Commented drink from hands at ponds due to client FPS impact. Players can still fill drinks at ponds by right clicking a container. #1816
diff --git a/SQF/dayz_code/Configs/RscDisplay/RscMap.hpp b/SQF/dayz_code/Configs/RscDisplay/RscMap.hpp
index 9d77d01bf..c2e917dc8 100644
--- a/SQF/dayz_code/Configs/RscDisplay/RscMap.hpp
+++ b/SQF/dayz_code/Configs/RscDisplay/RscMap.hpp
@@ -27,8 +27,6 @@ class RscDisplayMainMap
 			h = "0.832";
 			colorBackground[] = {0.30,0.30,0.30,0.85};
 		};
-		
-		
 		class DiaryList: RscIGUIListBox
 		{
 			idc = 1001;
@@ -42,4 +40,10 @@ class RscDisplayMainMap
 			h = "0";
 		};
 	};
+};
+
+class RscDisplayInsertMarker
+{
+	idd = 54;
+	onUnload = "if (!isNil 'player_markMap') then {(_this select 0) call player_markMap;};";
 };
\ No newline at end of file
diff --git a/SQF/dayz_code/compile/player_markMap.sqf b/SQF/dayz_code/compile/player_markMap.sqf
new file mode 100644
index 000000000..b9fd59028
--- /dev/null
+++ b/SQF/dayz_code/compile/player_markMap.sqf
@@ -0,0 +1,10 @@
+private ["_text","_textBox"];
+
+disableSerialization;
+_textBox = _this displayCtrl 101;
+_text = ctrlText _textBox;
+
+if (alive player) then {
+	_text = if (_text == "") then {name player} else {format["%1: %2",name player,_text]};
+	_textBox ctrlSetText _text;
+};
\ No newline at end of file
diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf
index ff0a62157..682550753 100644
--- a/SQF/dayz_code/init/compiles.sqf
+++ b/SQF/dayz_code/init/compiles.sqf
@@ -130,6 +130,7 @@ if (!isDedicated) then {
 	player_toggleStreamerMode = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_toggleStreamerMode.sqf";
 	player_selectSlot = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_selectSlot.sqf";
 	player_selectWeapon = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_selectWeapon.sqf";
+	player_markMap = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_markMap.sqf";
 	player_gearSet = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_gearSet.sqf";
 	ui_changeDisplay = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_changeDisplay.sqf";
     ui_gear_sound = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\ui_gear_sound.sqf";