diff --git a/ChangeLog b/ChangeLog
index dd418a178..7aa8ff857 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,7 @@ release 0.14.2
 	* fixed potential issue in udp_socket (affected udp tracker support)
 	* made name, comment and created by also be subject to utf-8 error
 	  correction (filenames already were)
+	* fixed dead-lock when settings DHT proxy
 
 release 0.14.1
 
diff --git a/src/udp_socket.cpp b/src/udp_socket.cpp
index 3b3c6c8b8..165ed4ded 100644
--- a/src/udp_socket.cpp
+++ b/src/udp_socket.cpp
@@ -378,6 +378,7 @@ void udp_socket::on_name_lookup(error_code const& e, tcp::resolver::iterator i)
 
 	m_proxy_addr.address(i->endpoint().address());
 	m_proxy_addr.port(i->endpoint().port());
+	l.unlock(); // on_connect may be called from within this thread
 	m_cc.enqueue(boost::bind(&udp_socket::on_connect, this, _1)
 		, boost::bind(&udp_socket::on_timeout, this), seconds(10));
 }