diff --git a/Jamfile b/Jamfile
index e7ac7cd9c..963d6cd77 100644
--- a/Jamfile
+++ b/Jamfile
@@ -473,8 +473,7 @@ feature disk-stats : off on : composite propagated link-incompatible ;
 feature.compose <disk-stats>on : <define>TORRENT_DISK_STATS ;
 
 feature utp-log : off on : composite propagated link-incompatible ;
-feature.compose <utp-log>off : <define>TORRENT_UTP_LOG=0 <define>TORRENT_VERBOSE_UTP_LOG=0 ;
-feature.compose <utp-log>on : <define>TORRENT_UTP_LOG=1 <define>TORRENT_VERBOSE_UTP_LOG=1 ;
+feature.compose <utp-log>on : <define>TORRENT_UTP_LOG_ENABLE ;
 
 feature simulate-slow-read : off on : composite propagated ;
 feature.compose <simulate-slow-read>on : <define>TORRENT_SIMULATE_SLOW_READ ;
diff --git a/include/libtorrent/utp_stream.hpp b/include/libtorrent/utp_stream.hpp
index 4c97f176f..7105fbda6 100644
--- a/include/libtorrent/utp_stream.hpp
+++ b/include/libtorrent/utp_stream.hpp
@@ -55,6 +55,13 @@ POSSIBILITY OF SUCH DAMAGE.
 
 namespace libtorrent
 {
+#ifndef TORRENT_UTP_LOG_ENABLE
+	#define TORRENT_UTP_LOG 0
+	#define TORRENT_VERBOSE_UTP_LOG 0
+#else
+	#define TORRENT_UTP_LOG 1
+	#define TORRENT_VERBOSE_UTP_LOG 1
+#endif
 
 #ifdef TORRENT_UTP_LOG
 	bool is_utp_stream_logging();