diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index 0afdf806..677e85ba 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -1,8 +1,19 @@
 = Changelog
 
+== 0.18
+
+- update implem of `CCVector.equal`
+- add `CCOpt.get_or` with label, deprecates `get`
+- add `CCArray.get_safe` (close #70)
+- add `CCGraph.is_dag`
+- add aliases to deprecated  functions from `String`, add `Fun.opaque_identity`
+- add `CCLazy_list.take`
+- add `Lazy_list.filter`
+- add CCList.range_by
+
 == 0.17
 
-=== potentially breaking 
+=== potentially breaking
 
 - change the semantics of `CCString.find_all` (allow overlaps)
 
diff --git a/_oasis b/_oasis
index 5038b5f5..c89760dd 100644
--- a/_oasis
+++ b/_oasis
@@ -1,6 +1,6 @@
 OASISFormat: 0.4
 Name:        containers
-Version:     0.17
+Version:     0.18
 Homepage:    https://github.com/c-cube/ocaml-containers
 Authors:     Simon Cruanes
 License:     BSD-2-clause
diff --git a/src/core/CCArray.ml b/src/core/CCArray.ml
index a5496aef..a7230a77 100644
--- a/src/core/CCArray.ml
+++ b/src/core/CCArray.ml
@@ -24,7 +24,7 @@ module type S = sig
 
   val get_safe : 'a t -> int -> 'a option
   (** [get_safe a i] returns [Some a.(i)] if [i] is a valid index
-      @since NEXT_RELEASE *)
+      @since 0.18 *)
 
   val set : 'a t -> int -> 'a -> unit
 
diff --git a/src/core/CCArray.mli b/src/core/CCArray.mli
index b8b83b84..eb6b9d29 100644
--- a/src/core/CCArray.mli
+++ b/src/core/CCArray.mli
@@ -26,7 +26,7 @@ module type S = sig
 
   val get_safe : 'a t -> int -> 'a option
   (** [get_safe a i] returns [Some a.(i)] if [i] is a valid index
-      @since NEXT_RELEASE *)
+      @since 0.18 *)
 
   val set : 'a t -> int -> 'a -> unit
 
diff --git a/src/core/CCFun.mli b/src/core/CCFun.mli
index 6f8a1c0e..8ff1f20d 100644
--- a/src/core/CCFun.mli
+++ b/src/core/CCFun.mli
@@ -69,7 +69,7 @@ val opaque_identity : 'a -> 'a
 (** [opaque_identity x] is like [x], but prevents Flambda from using [x]'s
     definition for optimizing it (flambda is an optimization/inlining pass
     in OCaml >= 4.03).
-    @since NEXT_RELEASE *)
+    @since 0.18 *)
 
 (** {2 Monad}
 
diff --git a/src/core/CCList.mli b/src/core/CCList.mli
index 8bb1ba7e..a3a35b26 100644
--- a/src/core/CCList.mli
+++ b/src/core/CCList.mli
@@ -280,7 +280,7 @@ val range_by : step:int -> int -> int -> int t
     where the difference between successive elements is [step].
     use a negative [step] for a decreasing list.
     @raise Invalid_argument if [step=0]
-    @since NEXT_RELEASE *)
+    @since 0.18 *)
 
 val range : int -> int -> int t
 (** [range i j] iterates on integers from [i] to [j] included . It works
diff --git a/src/core/CCOpt.mli b/src/core/CCOpt.mli
index 0214fa41..cb2242ba 100644
--- a/src/core/CCOpt.mli
+++ b/src/core/CCOpt.mli
@@ -63,12 +63,12 @@ val for_all : ('a -> bool) -> 'a t -> bool
 val get : 'a -> 'a t -> 'a
 (** [get default x] unwraps [x], but if [x = None] it returns [default] instead.
     @since 0.4.1
-    @deprecated use {!get_or} @since NEXT_RELEASE *)
+    @deprecated use {!get_or} @since 0.18 *)
 
 val get_or : default:'a -> 'a t -> 'a
 (** [get_or ~default o] extracts the value from [o], or
     returns [default] if [o = None].
-    @since NEXT_RELEASE *)
+    @since 0.18 *)
 
 val get_exn : 'a t -> 'a
 (** Open the option, possibly failing if it is [None]
diff --git a/src/core/CCString.mli b/src/core/CCString.mli
index edee2895..4d292fd1 100644
--- a/src/core/CCString.mli
+++ b/src/core/CCString.mli
@@ -384,16 +384,16 @@ val exists2 : (char -> char -> bool) -> string -> string -> bool
     a stable alias for them even in older versions *)
 
 val capitalize_ascii : string -> string
-(** See {!String}. @since NEXT_RELEASE *)
+(** See {!String}. @since 0.18 *)
 
 val uncapitalize_ascii : string -> string
-(** See {!String}. @since NEXT_RELEASE *)
+(** See {!String}. @since 0.18 *)
 
 val uppercase_ascii : string -> string
-(** See {!String}. @since NEXT_RELEASE *)
+(** See {!String}. @since 0.18 *)
 
 val lowercase_ascii : string -> string
-(** See {!String}. @since NEXT_RELEASE *)
+(** See {!String}. @since 0.18 *)
 
 
 (** {2 Splitting} *)
diff --git a/src/data/CCGraph.mli b/src/data/CCGraph.mli
index 36511313..5ccb00f2 100644
--- a/src/data/CCGraph.mli
+++ b/src/data/CCGraph.mli
@@ -233,7 +233,7 @@ val is_dag :
   bool
 (** [is_dag ~graph vs] returns [true] if the subset of [graph] reachable
     from [vs] is acyclic.
-    @since NEXT_RELEASE *)
+    @since 0.18 *)
 
 (** {2 Topological Sort} *)
 
diff --git a/src/iter/CCLazy_list.mli b/src/iter/CCLazy_list.mli
index 613be3fe..3f046fb2 100644
--- a/src/iter/CCLazy_list.mli
+++ b/src/iter/CCLazy_list.mli
@@ -33,11 +33,11 @@ val map : f:('a -> 'b) -> 'a t -> 'b t
 
 val filter : f:('a -> bool) -> 'a t -> 'a t
 (** Filter values.
-    @since NEXT_RELEASE *)
+    @since 0.18 *)
 
 val take : int -> 'a t -> 'a t
 (** Take at most n values.
-    @since NEXT_RELEASE *)
+    @since 0.18 *)
 
 val append : 'a t -> 'a t -> 'a t
 (** Lazy concatenation *)