diff --git a/testnet/MTQ.hpp b/attic/testnet/MTQ.hpp
similarity index 100%
rename from testnet/MTQ.hpp
rename to attic/testnet/MTQ.hpp
diff --git a/testnet/README.md b/attic/testnet/README.md
similarity index 100%
rename from testnet/README.md
rename to attic/testnet/README.md
diff --git a/testnet/SimNet.cpp b/attic/testnet/SimNet.cpp
similarity index 100%
rename from testnet/SimNet.cpp
rename to attic/testnet/SimNet.cpp
diff --git a/testnet/SimNet.hpp b/attic/testnet/SimNet.hpp
similarity index 100%
rename from testnet/SimNet.hpp
rename to attic/testnet/SimNet.hpp
diff --git a/testnet/SimNetSocketManager.cpp b/attic/testnet/SimNetSocketManager.cpp
similarity index 100%
rename from testnet/SimNetSocketManager.cpp
rename to attic/testnet/SimNetSocketManager.cpp
diff --git a/testnet/SimNetSocketManager.hpp b/attic/testnet/SimNetSocketManager.hpp
similarity index 100%
rename from testnet/SimNetSocketManager.hpp
rename to attic/testnet/SimNetSocketManager.hpp
diff --git a/testnet/TestEthernetTap.cpp b/attic/testnet/TestEthernetTap.cpp
similarity index 100%
rename from testnet/TestEthernetTap.cpp
rename to attic/testnet/TestEthernetTap.cpp
diff --git a/testnet/TestEthernetTap.hpp b/attic/testnet/TestEthernetTap.hpp
similarity index 100%
rename from testnet/TestEthernetTap.hpp
rename to attic/testnet/TestEthernetTap.hpp
diff --git a/testnet/TestEthernetTapFactory.cpp b/attic/testnet/TestEthernetTapFactory.cpp
similarity index 100%
rename from testnet/TestEthernetTapFactory.cpp
rename to attic/testnet/TestEthernetTapFactory.cpp
diff --git a/testnet/TestEthernetTapFactory.hpp b/attic/testnet/TestEthernetTapFactory.hpp
similarity index 100%
rename from testnet/TestEthernetTapFactory.hpp
rename to attic/testnet/TestEthernetTapFactory.hpp
diff --git a/make-freebsd.mk b/make-freebsd.mk
index a69dab344..bfa2c13c5 100644
--- a/make-freebsd.mk
+++ b/make-freebsd.mk
@@ -48,7 +48,7 @@ endif
 
 # "make debug" is a shortcut for this
 ifeq ($(ZT_DEBUG),1)
-#	DEFS+=-DZT_TRACE -DZT_LOG_STDOUT 
+	DEFS+=-DZT_TRACE 
 	CFLAGS=-Wall -g -pthread $(INCLUDES) $(DEFS)
 	LDFLAGS=
 	STRIP=echo
diff --git a/make-linux.mk b/make-linux.mk
index b3b0fefd2..d4cb9d89b 100644
--- a/make-linux.mk
+++ b/make-linux.mk
@@ -49,7 +49,7 @@ endif
 
 # "make debug" is a shortcut for this
 ifeq ($(ZT_DEBUG),1)
-#	DEFS+=-DZT_TRACE -DZT_LOG_STDOUT 
+	DEFS+=-DZT_TRACE 
 	CFLAGS=-Wall -g -pthread $(INCLUDES) $(DEFS)
 	LDFLAGS=
 	STRIP=echo