diff --git a/src/Makefile b/src/Makefile
index d7a8345cd..0456990f3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -49,6 +49,7 @@
 #                    Already enabled by default for 32-bit
 #                    Windows.
 # NOCURL=1 - Disable libcurl--HTTP capability.
+# NOHOLEPUNCH=1 - Disable holepunch capability.
 # NOLIBGME=1 - Disable game music emu, retro VGM support.
 # NOOPENMPT=1 - Disable module (tracker) music support.
 # NOMIXER=1 - Disable SDL Mixer (audio playback).
diff --git a/src/Makefile.d/features.mk b/src/Makefile.d/features.mk
index fc1e8b69f..b191ae2c1 100644
--- a/src/Makefile.d/features.mk
+++ b/src/Makefile.d/features.mk
@@ -6,7 +6,8 @@ passthru_opts+=\
 	NOHW NOMD5 NOPOSTPROCESSING\
 	MOBJCONSISTANCY PACKETDROP ZDEBUG\
 	HAVE_MINIUPNPC\
-	HAVE_DISCORDRPC DEVELOP
+	HAVE_DISCORDRPC DEVELOP\
+	NOHOLEPUNCH\
 
 # build with debugging information
 ifdef DEBUGMODE
diff --git a/src/doomdef.h b/src/doomdef.h
index 00b4bc1f0..a0c76fa61 100644
--- a/src/doomdef.h
+++ b/src/doomdef.h
@@ -651,7 +651,9 @@ extern const char *compdate, *comptime, *comprevision, *compbranch;
 
 #if defined (HAVE_CURL)
 #define MASTERSERVER
+#ifndef NOHOLEPUNCH
 #define HOLEPUNCH
+#endif
 #else
 #undef UPDATE_ALERT
 #endif