diff --git a/modules/editor/file-templates/templates/text-mode/__license-gpl3 b/modules/editor/file-templates/templates/text-mode/__license-gpl3
index 197d810c1..f9f75f7a5 100644
--- a/modules/editor/file-templates/templates/text-mode/__license-gpl3
+++ b/modules/editor/file-templates/templates/text-mode/__license-gpl3
@@ -637,8 +637,8 @@ to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    ${4:<one line to give the program's name and a brief idea of what it does.>}
+    Copyright (C) ${1:`(format-time-string "%Y")`} ${2:`user-full-name`}
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -658,7 +658,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    ${3:<program>}  Copyright (C) ${1:`(format-time-string "%Y")`} ${2:`user-full-name`}
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.