diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e34c5e3..bed16d26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,11 @@ if(DEBUG)
   add_definitions(-DTOX_DEBUG=1)
 endif()
 
+option(ASSOC_DHT "Enable module to store currently unused ID <=> IP associations" OFF)
+if(ASSOC_DHT)
+  add_definitions(-DENABLE_ASSOC_DHT=1)
+endif()
+
 find_package(PkgConfig REQUIRED)
 find_package(Threads   REQUIRED)
 
diff --git a/other/travis/toxcore-script b/other/travis/toxcore-script
index 196fd76e..6cf544ed 100755
--- a/other/travis/toxcore-script
+++ b/other/travis/toxcore-script
@@ -12,7 +12,7 @@ git diff --exit-code
 
 # Build toxcore and run tests.
 export CFLAGS="-O3 -fprofile-arcs -ftest-coverage -DTRAVIS_ENV=1"
-RUN $CMAKE -B$BUILD_DIR -H. -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DLOGGING=ON -DDEBUG=ON
+RUN $CMAKE -B$BUILD_DIR -H. -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DLOGGING=ON -DDEBUG=ON -DASSOC_DHT=ON
 
 export CTEST_OUTPUT_ON_FAILURE=1