diff --git a/CMakeLists.txt b/CMakeLists.txt
index 167a36ee60004e4fbc78ca09b83ab27acb8024a8..9d98745b1c9378d74ca679636e86bc416ff8fc99 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,20 +83,21 @@ check_function_exists(fmemopen HAVE_FMEMOPEN)
 check_function_exists(funopen HAVE_FUNOPEN)
 check_function_exists(fopencookie HAVE_FOPENCOOKIE)
 check_function_exists(uuidgen HAVE_UUIDGEN)
-# ensure clock_gettime() is declared and actually available
-# in runtime (gh-1777)
+set(CMAKE_REQUIRED_LIBRARIES "")
+if (TARGET_OS_LINUX)
+    set(CMAKE_REQUIRED_LIBRARIES rt)
+endif ()
 check_symbol_exists(clock_gettime time.h HAVE_CLOCK_GETTIME_DECL)
-if (${HAVE_CLOCK_GETTIME_DECL})
-    function(check_code_using_clock_gettime_runs) # start new scope
-        if (${TARGET_OS_LINUX})
-            set(CMAKE_REQUIRED_LIBRARIES rt)
-        endif()
-        check_c_source_runs(
-            "#include <time.h>\nint main() {struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); return 0;}"
-            HAVE_CLOCK_GETTIME)
-    endfunction()
-    check_code_using_clock_gettime_runs()
+if (HAVE_CLOCK_GETTIME_DECL AND TARGET_OS_DARWIN)
+    # ensure clock_gettime() is declared and actually available
+    # in runtime (gh-1777)
+    check_c_source_runs(
+        "#include <time.h>\nint main() {struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); return 0;}"
+        HAVE_CLOCK_GETTIME)
+else ()
+    set(HAVE_CLOCK_GETTIME ${HAVE_CLOCK_GETTIME_DECL})
 endif ()
+set(CMAKE_REQUIRED_LIBRARIES "")
 
 # Checks for libev
 include(CheckStructHasMember)
diff --git a/debian/changelog b/debian/changelog
index f29c75f3e108bab9446f866b9dce95f9c74594c2..98d905c83d1e33741c81fd48d9e825fec1987229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,20 @@
-tarantool (1.7.1.265.g479962c-1) unstable; urgency=medium
+tarantool (1.7.1.475.g899bc6d-1) unstable; urgency=medium
 
   * Enable systemd integration, fix sysvinit + systemd interoperability.
   * Start 'example.lua' instance by default on 'localhost:3301'.
 
- -- Roman Tsisyk <roman@tarantool.org>  Thu, 01 Sep 2016 10:00:00 +0300
+ -- Roman Tsisyk <roman@tarantool.org>  Tue, 27 Sep 2016 13:45:57 +0300
+
+tarantool (1.6.9.1.g3a3f705-1) unstable; urgency=medium
+
+  * Tab-based autocompletion in the interactive console
+  * LUA_PATH and LUA_CPATH environment variables taken into account
+  * A new box.cfg { read_only = true } option
+  * Upgrade script for 1.6.4 -> 1.6.8 -> 1.6.9
+  * Bugs fixed:
+  https://github.com/tarantool/tarantool/issues?q=milestone%3A1.6.9+is%3Aclosed
+
+ -- Roman Tsisyk <roman@tarantool.org>  Mon, 26 Sep 2016 16:21:39 +0300
 
 tarantool (1.6.8.762.g15ed10e-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index ab0e84af10f6b6fee231f20ce037b62868638307..fae8ad99d2ae2be90b3439f831e12c7731a5c47e 100644
--- a/debian/control
+++ b/debian/control
@@ -57,7 +57,7 @@ Package: tarantool
 Architecture: i386 amd64 armhf arm64
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}, binutils, libgomp1, libyaml-0-2,
- openssl, tarantool-common (>= 1.7.1.142)
+ openssl, tarantool-common (>= 1.7.1.475)
 Replaces: tarantool-lts
 Conflicts: tarantool-lts-common,
  tarantool-lts,
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index de357a06512dbc7f345894f8fe4443736b142f2d..5814a833b676bcf5c13458eabdfcf4c436498f85 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -206,7 +206,15 @@ chkconfig --del tarantool
 %{_includedir}/tarantool/module.h
 
 %changelog
-* Tue Sep 01 2016 Roman Tsisyk <roman@tarantool.org> 1.6.8.762-1
+* Mon Sep 26 2016 Roman Tsisyk <roman@tarantool.org> 1.6.9.1-1
+ - Tab-based autocompletion in the interactive console
+ - LUA_PATH and LUA_CPATH environment variables taken into account
+ - A new box.cfg { read_only = true } option
+ - Upgrade script for 1.6.4 -> 1.6.8 -> 1.6.9
+ - Bugs fixed:
+   https://github.com/tarantool/tarantool/issues?q=milestone%3A1.6.9+is%3Aclosed
+
+* Thu Sep 01 2016 Roman Tsisyk <roman@tarantool.org> 1.6.8.762-1
 - Add support for OpenSSL 1.1
 
 * Tue Feb 09 2016 Roman Tsisyk <roman@tarantool.org> 1.6.8.462-1
diff --git a/test/xlog/suite.cfg b/test/xlog/suite.cfg
index 50f56ffde850d4c814e21549475866028930d079..20858e0487580362996eac82382f59fbe01e927c 100644
--- a/test/xlog/suite.cfg
+++ b/test/xlog/suite.cfg
@@ -3,6 +3,7 @@
         "1.6.5": {"version": "1.6.5"},
         "1.6.6": {"version": "1.6.6"},
         "1.6.7": {"version": "1.6.7"},
-        "1.6.8": {"version": "1.6.8"}
+        "1.6.8": {"version": "1.6.8"},
+        "1.6.9": {"version": "1.6.9"}
     }
 }
diff --git a/test/xlog/upgrade/1.6.9/00000000000000000000.snap b/test/xlog/upgrade/1.6.9/00000000000000000000.snap
new file mode 100644
index 0000000000000000000000000000000000000000..a4769010fa91e0a1552b3266c951d0345994d8dc
Binary files /dev/null and b/test/xlog/upgrade/1.6.9/00000000000000000000.snap differ
diff --git a/test/xlog/upgrade/1.6.9/00000000000000000000.xlog b/test/xlog/upgrade/1.6.9/00000000000000000000.xlog
new file mode 100644
index 0000000000000000000000000000000000000000..ff470f11440b023b437a880d98c1da0c769921d2
Binary files /dev/null and b/test/xlog/upgrade/1.6.9/00000000000000000000.xlog differ
diff --git a/test/xlog/upgrade/1.6.9/00000000000000000005.xlog b/test/xlog/upgrade/1.6.9/00000000000000000005.xlog
new file mode 100644
index 0000000000000000000000000000000000000000..60e869eda372fb261600bac3d2bef8d0e9edb04f
Binary files /dev/null and b/test/xlog/upgrade/1.6.9/00000000000000000005.xlog differ
diff --git a/test/xlog/upgrade/1.6.9/00000000000000000010.xlog b/test/xlog/upgrade/1.6.9/00000000000000000010.xlog
new file mode 100644
index 0000000000000000000000000000000000000000..d0be6c294075098986204e452d7bc757def38bfc
Binary files /dev/null and b/test/xlog/upgrade/1.6.9/00000000000000000010.xlog differ
diff --git a/test/xlog/upgrade/1.6.9/00000000000000000015.xlog b/test/xlog/upgrade/1.6.9/00000000000000000015.xlog
new file mode 100644
index 0000000000000000000000000000000000000000..f203ad2bd0ea3b86f2d9cc1490c52d1193b39c80
Binary files /dev/null and b/test/xlog/upgrade/1.6.9/00000000000000000015.xlog differ
diff --git a/test/xlog/upgrade/1.6.9/00000000000000000020.xlog b/test/xlog/upgrade/1.6.9/00000000000000000020.xlog
new file mode 100644
index 0000000000000000000000000000000000000000..bf4b9bfe64e201af88eb88b2f05f194a024cffaf
Binary files /dev/null and b/test/xlog/upgrade/1.6.9/00000000000000000020.xlog differ
diff --git a/test/xlog/upgrade/1.6.9/00000000000000000025.xlog b/test/xlog/upgrade/1.6.9/00000000000000000025.xlog
new file mode 100644
index 0000000000000000000000000000000000000000..10d68e9f64b3562133e5edb02cf41c0ceaab3a4a
Binary files /dev/null and b/test/xlog/upgrade/1.6.9/00000000000000000025.xlog differ
diff --git a/test/xlog/upgrade/1.6.9/00000000000000000030.xlog b/test/xlog/upgrade/1.6.9/00000000000000000030.xlog
new file mode 100644
index 0000000000000000000000000000000000000000..3e0d4d414eeea4ca4c185498e17f0b7f0c26081d
Binary files /dev/null and b/test/xlog/upgrade/1.6.9/00000000000000000030.xlog differ
diff --git a/test/xlog/upgrade/1.6.9/version b/test/xlog/upgrade/1.6.9/version
new file mode 100644
index 0000000000000000000000000000000000000000..65e71a3e247dfbeb2ef5aa3434e60723079ed4b0
--- /dev/null
+++ b/test/xlog/upgrade/1.6.9/version
@@ -0,0 +1 @@
+1.6.9-0-gd36ba27