diff --git a/Makefile b/Makefile
index 87327e77..22f016ea 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ include filelist.mk
 
 USE_AESNI  := yes
 USE_STATIC := no
-USE_MESHNET := yes
+USE_MESHNET := no
 USE_UPNP   := no
 
 ifeq ($(UNAME),Darwin)
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index cc11b207..edde2e06 100644
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -12,7 +12,7 @@ option(WITH_STATIC    "Static build" OFF)
 option(WITH_UPNP "Include support for UPnP client" OFF)
 option(WITH_PCH "Use precompiled header" OFF)
 option(WITH_GUI "Include GUI (currently MS Windows only)" ON)
-option(WITH_MESHNET "Build for cjdns test network" ON)
+option(WITH_MESHNET "Build for cjdns test network" OFF)
 
 # paths
 set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )