diff --git a/configs/samples/extensions_minivm.conf.sample b/configs/samples/extensions_minivm.conf.sample
index 2f9d246370dad28623e1e203aedd6fd6653c6c9f..7bd1df1d21ff4f6863ef67b80dc1972c0374226d 100644
--- a/configs/samples/extensions_minivm.conf.sample
+++ b/configs/samples/extensions_minivm.conf.sample
@@ -1,7 +1,5 @@
 ; MINI-VOICEMAIL dialplan example
 ; ---------------------------------------------------------------------------------------
-; ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
-;
 ;
 ; This is an example on how to use the Mini-Voicemail system to build
 ; voicemail systems.
diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl
index e10dde200579d40b28f42fed504fd7043b006cc1..af03c013faedcb1e6d117530f62f864696d1daa9 100644
--- a/main/ast_expr2.fl
+++ b/main/ast_expr2.fl
@@ -26,7 +26,7 @@
 #include <stdio.h>
 
 #if !defined(STANDALONE)
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 #else
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
diff --git a/main/ast_expr2.y b/main/ast_expr2.y
index e8c68e3330f1c4bbd0fc0b8bbc3eb3838a523b5c..8a151679d2cd67ce7f3853eb4ca8a515654f01cf 100644
--- a/main/ast_expr2.y
+++ b/main/ast_expr2.y
@@ -20,7 +20,7 @@
 
 #if !defined(STANDALONE) && !defined(STANDALONE2)	\
 	
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 #else
 #ifndef __USE_ISOC99
 #define __USE_ISOC99 1
diff --git a/res/ael/ael.flex b/res/ael/ael.flex
index 5a7fd83047e4fa368d395f117030b68db8421fd2..a412eaf3493bb906d337634974a7d5eb46699f44 100644
--- a/res/ael/ael.flex
+++ b/res/ael/ael.flex
@@ -70,7 +70,7 @@
 %{
 #define WRAP_LIBC_MALLOC
 #include "asterisk.h"
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/res/ael/ael.y b/res/ael/ael.y
index c1a6f0f2b91ac558a6201b1a2747231b134bae81..5ab9c969f0256fb3b863ea636ae4d11e663e4e4b 100644
--- a/res/ael/ael.y
+++ b/res/ael/ael.y
@@ -25,7 +25,7 @@
 #define WRAP_LIBC_MALLOC
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/rest-api-templates/ari_model_validators.c.mustache b/rest-api-templates/ari_model_validators.c.mustache
index 9d316715630131cada0fd0109c4d49ab3d585256..9603fadbf543989f5357945cc3c9f2ed0b2bb52d 100644
--- a/rest-api-templates/ari_model_validators.c.mustache
+++ b/rest-api-templates/ari_model_validators.c.mustache
@@ -27,7 +27,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/logger.h"
 #include "asterisk/module.h"
diff --git a/rest-api-templates/ari_resource.c.mustache b/rest-api-templates/ari_resource.c.mustache
index e2b234240fa02efed47c83518ccd9b76ce21a97a..b8f20e675283e9a08da0c899b037127a1cbcb077 100644
--- a/rest-api-templates/ari_resource.c.mustache
+++ b/rest-api-templates/ari_resource.c.mustache
@@ -26,7 +26,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "resource_{{c_name}}.h"
 
diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache
index 896ee0d1dd64fadb26449729d0d7e21f9b6293db..9893c973145757e0cc2a62c0c365a4dbe46a7ea7 100644
--- a/rest-api-templates/res_ari_resource.c.mustache
+++ b/rest-api-templates/res_ari_resource.c.mustache
@@ -44,7 +44,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ASTERISK_REGISTER_FILE()
 
 #include "asterisk/app.h"
 #include "asterisk/module.h"