diff --git a/CMakeLists.txt b/CMakeLists.txt
index abb1fc0992dcdd3383d2d19b2eb47d829d7cec4f..61b72dea17a9d8960954fa0968e280102f83ddd7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -113,7 +113,7 @@ add_custom_target(tags COMMAND ctags -R -f tags
 #
 set (CPACK_PACKAGE_VERSION_MAJOR "1")
 set (CPACK_PACKAGE_VERSION_MINOR "6")
-set (CPACK_PACKAGE_VERSION_PATCH "5")
+set (CPACK_PACKAGE_VERSION_PATCH "6")
 
 set (PACKAGE_VERSION "")
 
diff --git a/src/box/box.cc b/src/box/box.cc
index 35b4143699987e12584a6f901cbe7d72f3233129..cb871ba1b1851c7a78acd13ded282ae4d77d448a 100644
--- a/src/box/box.cc
+++ b/src/box/box.cc
@@ -502,6 +502,9 @@ box_load_cfg()
 void
 box_atfork()
 {
+	/* NULL when forking for box.cfg{background = true} */
+	if (recovery == NULL)
+		return;
 	/* box.coredump() forks to save a core. */
 	recovery_atfork(recovery);
 }