diff --git a/include/asterisk.h b/include/asterisk.h
index 35628d231a..ee1a9c337c 100644
--- a/include/asterisk.h
+++ b/include/asterisk.h
@@ -90,7 +90,7 @@ int ast_pbx_init(void);				/*!< Provided by pbx.c */
 int ast_register_atexit(void (*func)(void));
 
 /*!
- * \since 12
+ * \since 11.9
  * \brief Register a function to be executed before Asterisk gracefully exits.
  *
  * If Asterisk is immediately shutdown (core stop now, or sending the TERM
diff --git a/main/format.c b/main/format.c
index 5791410706..9c7b5919a9 100644
--- a/main/format.c
+++ b/main/format.c
@@ -1149,7 +1149,7 @@ int ast_format_attr_init(void)
 	}
 
 	ast_cli_register_multiple(my_clis, ARRAY_LEN(my_clis));
-	ast_register_atexit(format_attr_shutdown);
+	ast_register_cleanup(format_attr_shutdown);
 	return 0;
 }