diff --git a/sys/contrib/ck/include/ck_md.h b/sys/contrib/ck/include/ck_md.h
index 83174540276f..22b1e6a22bec 100644
--- a/sys/contrib/ck/include/ck_md.h
+++ b/sys/contrib/ck/include/ck_md.h
@@ -57,7 +57,7 @@
 #define CK_MD_RMO
 #endif /* CK_MD_RMO */
 
-#define CK_VERSION "0.5.2"
+#define CK_VERSION "0.6.0"
 #define CK_GIT_SHA ""
 
 /*
diff --git a/sys/contrib/ck/src/ck_epoch.c b/sys/contrib/ck/src/ck_epoch.c
index 7cddfa7597c6..a0e9180a1fdc 100644
--- a/sys/contrib/ck/src/ck_epoch.c
+++ b/sys/contrib/ck/src/ck_epoch.c
@@ -309,11 +309,12 @@ ck_epoch_scan(struct ck_epoch *global,
 {
 	ck_stack_entry_t *cursor;
 
-	*af = false;
 	if (cr == NULL) {
 		cursor = CK_STACK_FIRST(&global->records);
+		*af = false;
 	} else {
 		cursor = &cr->record_next;
+		*af = true;
 	}
 
 	while (cursor != NULL) {