Index: main/cdr.c
===================================================================
--- main/cdr.c	(revision 375799)
+++ main/cdr.c	(working copy)
@@ -1612,9 +1612,21 @@
 	return res;
 }
 
+static void cdr_engine_shutdown(void)
+{
+	ast_cli_unregister(&cli_status);
+	if (cli_submit._full_cmd) {
+		ast_cdr_engine_term();
+		ast_cli_unregister(&cli_submit);
+	}
+	sched_context_destroy(sched);
+	ast_free(batch);
+}
+
 int ast_cdr_engine_init(void)
 {
 	int res;
+	ast_register_atexit(cdr_engine_shutdown);
 
 	sched = sched_context_create();
 	if (!sched) {