diff --git a/debian/changelog b/debian/changelog
index 98d905c83d1e33741c81fd48d9e825fec1987229..4548eebe6bac253a0b6460326374a9bdfee491a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
-tarantool (1.7.1.475.g899bc6d-1) unstable; urgency=medium
+tarantool (1.7.1.493.g499634d-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>  Tue, 27 Sep 2016 13:45:57 +0300
+ -- Roman Tsisyk <roman@tarantool.org>  Wed, 28 Sep 2016 19:47:26 +0300
+
+tarantool (1.6.9.6.g660e882-1) unstable; urgency=medium
+
+  * Add dependency on network configuration files used by `socket` module
+
+ -- Roman Tsisyk <roman@tarantool.org>  Wed, 28 Sep 2016 14:23:42 +0300
 
 tarantool (1.6.9.1.g3a3f705-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index fae8ad99d2ae2be90b3439f831e12c7731a5c47e..bcf9785063227f6f04b00e8107c4ab7cf335c060 100644
--- a/debian/control
+++ b/debian/control
@@ -56,8 +56,8 @@ Description: Tarantool in-memory database - common files
 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.475)
+Depends: ${shlibs:Depends}, ${misc:Depends}, netbase, binutils, libgomp1,
+ libyaml-0-2, openssl, tarantool-common (>= 1.7.1.475)
 Replaces: tarantool-lts
 Conflicts: tarantool-lts-common,
  tarantool-lts,
diff --git a/extra/dist/tarantool@.service.in b/extra/dist/tarantool@.service.in
index d110e4b7696e1f3ce17e913f67d5b7db6512cf9a..484c23b1ab2ea8c911fbbf3babc5bf7aad36181f 100644
--- a/extra/dist/tarantool@.service.in
+++ b/extra/dist/tarantool@.service.in
@@ -1,13 +1,35 @@
 # Please don't modify this file in-place, because it will be overwrriten
 # during package upgrades. It is recommended to copy this file to
 # /etc/systemd/system and then modify the chosen settings. Alternatively,
-# one can create a directory named unit.d/ within /etc/systemd/system and
+# one can create a directory named service.d/ within /etc/systemd/system and
 # place a drop-in file name.conf there that only changes the specific
 # settings one is interested in.
 #
-# Please see http://tarantool.org/doc/book/administration.html
-# for additional information.
+# For example, if you want to increase the maximum number of open files
+# for example.lua instance, you need to perform the following steps:
 #
+# 1. Create directory /etc/systemd/system/tarantool@example.service.d/ with
+#   file limits.conf containing:
+#
+#     [Service]
+#     LimitNOFILE=10000
+#
+# 2. Reload systemd daemon
+#
+#     systemctl daemon-reload
+#
+# 3. Check new settings
+#
+#     systemctl show tarantool@example|grep LimitNOFILE
+#
+# 4. Restart tarantool@example service
+#
+#     systemctl restart tarantool@example
+#
+# Please see http://tarantool.org/doc/book/administration.html and
+# systemd.service(5) man page for additional information.
+#
+
 [Unit]
 Description=Tarantool Database Server
 After=network.target
diff --git a/rpm/tarantool.spec b/rpm/tarantool.spec
index 5814a833b676bcf5c13458eabdfcf4c436498f85..26260aa433f030adf2db47764cacfcaaaed4658b 100644
--- a/rpm/tarantool.spec
+++ b/rpm/tarantool.spec
@@ -72,6 +72,10 @@ License: BSD
 Provides: tarantool-debuginfo = %{version}-%{release}
 Provides: tarantool-common = %{version}-%{release}
 Obsoletes: tarantool-common < 1.6.8.434-1
+# Add dependency on network configuration files used by `socket` module
+# https://github.com/tarantool/tarantool/issues/1794
+Requires: /etc/protocols
+Requires: /etc/services
 URL: http://tarantool.org
 Source0: http://download.tarantool.org/tarantool/1.7/src/tarantool-%{version}.tar.gz
 %description
@@ -206,6 +210,9 @@ chkconfig --del tarantool
 %{_includedir}/tarantool/module.h
 
 %changelog
+* Wed Sep 28 2016 Roman Tsisyk <roman@tarantool.org> 1.6.9.6-1
+ - Add dependency on network configuration files used by `socket` module
+
 * 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
diff --git a/src/lib/msgpuck b/src/lib/msgpuck
index c22aefe90a90d9eda0b012634c1d8593a751b1b4..4203ef6d53fbe0e1d76aabcf714df3769029252d 160000
--- a/src/lib/msgpuck
+++ b/src/lib/msgpuck
@@ -1 +1 @@
-Subproject commit c22aefe90a90d9eda0b012634c1d8593a751b1b4
+Subproject commit 4203ef6d53fbe0e1d76aabcf714df3769029252d
diff --git a/src/lib/small b/src/lib/small
index 60a7536e069bc44dd133e44fbe51899c5e5fa123..c231b45095e68d4e561970b4db7fe1f5c82669ec 160000
--- a/src/lib/small
+++ b/src/lib/small
@@ -1 +1 @@
-Subproject commit 60a7536e069bc44dd133e44fbe51899c5e5fa123
+Subproject commit c231b45095e68d4e561970b4db7fe1f5c82669ec
diff --git a/src/lua/socket.c b/src/lua/socket.c
index 613505094715aa4e4e50463d4f76942baf0a12e6..c2ab214dc3c681dea00c9f2e643d7807da5c76f6 100644
--- a/src/lua/socket.c
+++ b/src/lua/socket.c
@@ -861,6 +861,7 @@ lbox_socket_recvfrom(struct lua_State *L)
 			       (struct sockaddr*)&fa, &len);
 
 	if (res < 0) {
+		free(buf);
 		lua_pushnil(L);
 		return 1;
 	}
diff --git a/test-run b/test-run
index c2a33867ef997779278c606ab2cf2c6d5cfa7f53..36c624c3687296ac39aeab8d7ffe5099b16ce639 160000
--- a/test-run
+++ b/test-run
@@ -1 +1 @@
-Subproject commit c2a33867ef997779278c606ab2cf2c6d5cfa7f53
+Subproject commit 36c624c3687296ac39aeab8d7ffe5099b16ce639