diff --git a/core/templates/store.injected.template.html.tid b/core/templates/store.injected.template.html.tid
new file mode 100644
index 000000000..b372973b0
--- /dev/null
+++ b/core/templates/store.injected.template.html.tid
@@ -0,0 +1,21 @@
+title: $:/core/templates/store.injected.template.html
+
+\whitespace trim
+<!-- Unencrypted -->
+<$list filter="[[$:/isEncrypted]get[text]else[no]match[no]]">
+	<$list filter="[[storeAreaFormat]is[variable]getvariable[]else[json]match[json]]">
+		<!-- New-style JSON store area -->
+		`<script class="tiddlywiki-tiddler-store" type="application/json">[`
+            <$let
+				newline={{{ [charcode[10]] }}}
+				join=`,$(newline)$`
+			>
+				<$text text=<<newline>>/>
+					<$list filter="[all[shadows+tiddlers]tag[$:/tags/InjectCustomTiddlers]]">
+						<$transclude mode=block/>
+					</$list>
+				<$text text=<<newline>>/>
+			</$let>
+		`]</script>`
+	</$list>
+</$list>
diff --git a/core/templates/store.injected.timestamps.template.tid b/core/templates/store.injected.timestamps.template.tid
new file mode 100644
index 000000000..bc0744995
--- /dev/null
+++ b/core/templates/store.injected.timestamps.template.tid
@@ -0,0 +1,23 @@
+title: $:/core/templates/store.injected.timestamps.template
+caption: Inject last-saved and server-created timestamps
+tags: $:/tags/InjectCustomTiddlers
+
+<!-- This template will be injected into the html file when the wiki is saved. It is activated by $:/core/templates/store.injected.template.html -->
+\whitespace trim
+\procedure readableFormat() [UTC]YYYY-0MM-0DD 0hh:0mm:0ss.0XXX UTC TZD
+
+<!-- It's needed to use variables, to have the absolute same timestamp for all tiddlers -->
+<$let
+	timestamp={{{ [<now format:[UTC]YYYY0MM0DD0hh0mm0ss0XXX>] }}}
+	timeReadable={{{ [<timestamp>format:date<readableFormat>] }}}
+>
+	<% if [{$:/info/browser}match[yes]] %>
+		`{"title": "$:/info/last-saved/timestamp", "created":"`<<timestamp>>`", "modified":"`<<timestamp>>`", "text":"`<<timestamp>>`"}`
+		<$text text=<<join>>/>
+		`{"title": "$:/info/last-saved/date",  "created":"`<<timestamp>>`", "modified":"`<<timestamp>>`", "text":"`<<timeReadable>>`"}`
+	<% elseif [{$:/info/node}match[yes]] %>
+		`{"title": "$:/info/server-created-wiki/timestamp", "created":"`<<timestamp>>`", "modified":"`<<timestamp>>`", "text":"`<<timestamp>>`"}`
+		<$text text=<<join>>/>
+		`{"title": "$:/info/server-created-wiki/date",  "created":"`<<timestamp>>`", "modified":"`<<timestamp>>`", "text":"`<<timeReadable>>`"}`
+	<% endif %>
+</$let>
\ No newline at end of file
diff --git a/core/templates/tiddlywiki5.html.tid b/core/templates/tiddlywiki5.html.tid
index 721b3d9ce..bc28d4a1a 100644
--- a/core/templates/tiddlywiki5.html.tid
+++ b/core/templates/tiddlywiki5.html.tid
@@ -41,6 +41,7 @@ title: $:/core/templates/tiddlywiki5.html
 </noscript>
 <!--~~ Ordinary tiddlers ~~-->
 `{{$:/core/templates/store.area.template.html}}`
+`{{$:/core/templates/store.injected.template.html}}`
 <!--~~ Library modules ~~-->
 <div id="libraryModules" style="display:none;">
 `{{{ [is[system]type[application/javascript]library[yes]] ||$:/core/templates/javascript-tiddler}}}`
diff --git a/editions/tw5.com/tiddlers/SystemTag_ $__tags_InjectCustomTiddlers.tid b/editions/tw5.com/tiddlers/SystemTag_ $__tags_InjectCustomTiddlers.tid
new file mode 100644
index 000000000..2a5322ceb
--- /dev/null
+++ b/editions/tw5.com/tiddlers/SystemTag_ $__tags_InjectCustomTiddlers.tid	
@@ -0,0 +1,12 @@
+caption: $:/tags/InjectCustomTiddlers
+created: 20240311144347147
+description: marks JSON serialized tiddlers to be injected into a custom store prior to a save-file action
+modified: 20240311153411624
+tags: SystemTags
+title: SystemTag: $:/tags/InjectCustomTiddlers
+type: text/vnd.tiddlywiki
+
+The [[system tag|SystemTags]] `$:/tags/InjectCustomTiddlers` marks JSON serialized tiddlers to be injected [[into a custom store section|$:/core/templates/store.injected.template.html]] in the generated HTML file.
+
+Note that the wiki must be saved and reloaded in order for the tiddlers to be seen. More implementation details can be found in the [[developers wiki|https://tiddlywiki.com/dev/#SystemTag%3A %24%3A%2Ftags%2FInjectCustomTiddlers]]. 
+
diff --git a/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid
index 040dd7bd2..836b25345 100644
--- a/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid
@@ -1,5 +1,5 @@
 created: 20140720164948099
-modified: 20201124185829706
+modified: 20240131100514913
 tags: Mechanisms
 title: InfoMechanism
 type: text/vnd.tiddlywiki
@@ -13,7 +13,7 @@ System tiddlers in the namespace `$:/info/` are used to expose information about
 ! Information Tiddlers
 
 |!Title |!Description |
-|[[$:/info/startup-timestamp]] |<<.from-version "5.1.23">> Startup timestamp in TiddlyWiki date format |
+|[[$:/info/startup-timestamp]] |<<.from-version "5.1.23">> Startup timestamp in ~TiddlyWiki date format |
 |[[$:/info/browser]] |Running in the browser? ("yes" or "no") |
 |[[$:/info/mobile]] |<<.from-version "5.2.3">> Is running on a mobile device? ("yes" or "no" - eg, ''<<example full>>'') |
 |[[$:/info/browser/language]] |<<.from-version "5.1.20">> Language as reported by browser (note that some browsers report two character codes such as `en` while others report full codes such as `en-GB`) |
@@ -29,3 +29,41 @@ System tiddlers in the namespace `$:/info/` are used to expose information about
 |[[$:/info/url/protocol]] |<<.from-version "5.1.14">> Protocol portion of URL of wiki (eg, ''<<example protocol>>'') |
 |[[$:/info/url/search]] |<<.from-version "5.1.14">> Search portion of URL of wiki (eg, ''<<example search>>'') |
 |[[$:/info/darkmode]] |<<.from-version "5.1.23">> Is dark mode enabled? ("yes" or "no") |
+
+!! Last Saved -- Single File Wiki
+
+The following tiddlers will be "injected" into the HTML file when the wiki is saved. Tagged template tiddlers are used to create the info tiddlers. Those tiddlers will be overwritten with the next automatic or manual save action.
+
+`$:/info/last-saved/*` will  not be created on a server if used with a client-server configuration. They will be created, if a "snapshot" is saved to the disk.
+
+|! Title |! Description |
+|$:/info/last-saved/timestamp |<<.from-version "5.3.4">> This tiddler will be created when a single file wiki is saved. It uses ~TiddlyWiki DateFormat |
+|$:/info/last-saved/date |<<.from-version "5.3.4">> Shows the same last-saved timestamp in human readable form. Eg: "2024-01-30 15:36:04.430 UTC +01:00"<br>using the following format: `[UTC]YYYY-0MM-0DD 0hh:0mm:0ss.0XXX UTC TZD` |
+
+!! Client Server Configuration
+
+<<.warning """If a client server configuration is used, the TW template is used to create the wiki file on the server. So the timestamps saved to the "server-created" info tiddlers are generated by the server. Depending on the server "local time" this timestamp ''can be different'' to the current "user time". Whenever the wiki file is created, the values will be set. `server-created-*` tiddlers will ''not'' be deleted if saved as a single file. The information may have some value""">>
+
+|! Title |! Description |
+|$:/info/server-created-wiki/timestamp |<<.from-version "5.3.4">> This tiddler will be created when the server creates a wiki to be transferred to the client, ''ore'' if as single-file wiki is created by the server using the `--build index` command. It uses ~TiddlyWiki DateFormat |
+|$:/info/server-created-wiki/date |<<.from-version "5.3.4">> Shows the same timestamp in human readable form |
+
+!! Additional information
+
+By default ~TiddlyWiki does not save the full URL information to the file, due to privacy concerns. Eg: `$:/info/last-saved/full/url` can contain private information. Users are free to include the following code into their wiki, if they decide to do so. 
+
+<details><summary>Show code to add the full path to an info tiddler</summary>
+<$codeblock code="""title: inject-full-path
+tags: $:/tags/InfoTiddlerTemplate
+
+<!-- This template will be injected into the html file when the wiki is saved. It is activated by $:/core/templates/store.info.template.html -->
+\whitespace trim
+
+\function timestamp() [<now format:[UTC]YYYY0MM0DD0hh0mm0ss0XXX>]
+
+<% if [{$:/info/browser}match[yes]] %>
+	<$text text=<<join>>/>
+	`{"title": "$:/info/last-saved/full/url",  "created":"`<<timestamp>>`", "modified":"`<<timestamp>>`", "text":"`{{$:/info/url/full}}`"}`
+<% endif %>
+"""/>
+</details>