diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7e7f9c2..eab3bc45 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -77,7 +77,7 @@ if (${WITH_SOCKS} STREQUAL ON)
 	add_definitions("-DWITH_SOCKS")
 endif (${WITH_SOCKS} STREQUAL ON)
 
-option(WITH_SRV "Include SRV lookup support?" ON)
+option(WITH_SRV "Include SRV lookup support?" OFF)
 
 # ========================================
 # Include projects
diff --git a/ChangeLog.txt b/ChangeLog.txt
index fa3feae8..2ca432d3 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -29,6 +29,7 @@ Broker:
 Client library:
 - Outgoing messages with QoS>1 are no longer retried after a timeout period.
   Messages will be retried when a client reconnects. 
+- DNS-SRV support is now disabled by default.
 
 Client:
 - Add -x to mosquitto_sub for printing the payload in hexadecimal format.
diff --git a/config.mk b/config.mk
index 76399d7e..a1699050 100644
--- a/config.mk
+++ b/config.mk
@@ -62,7 +62,7 @@ WITH_SYS_TREE:=yes
 WITH_SYSTEMD:=no
 
 # Build with SRV lookup support.
-WITH_SRV:=yes
+WITH_SRV:=no
 
 # Build using libuuid for clientid generation (Linux only - please report if
 # supported on your platform).