diff --git a/Makefile.common b/Makefile.common
index 6e6436d3d3..772ee395c7 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -620,14 +620,19 @@ endif
 
 # Netplay
 
-ifeq ($(HAVE_NETPLAY), 1)
-   DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD
-   OBJ += netplay.o \
-			net_compat.o \
-			net_http.o
+ifeq ($(HAVE_NETWORK), 1)
+   DEFINES += -DHAVE_NETWORK
+   OBJ += net_compat.o
+
    ifneq ($(findstring Win32,$(OS)),)
       LIBS += -lws2_32
    endif
+
+   ifeq ($(HAVE_NETPLAY), 1)
+      DEFINES += -DHAVE_NETPLAY -DHAVE_NETWORK_CMD
+      OBJ += netplay.o \
+             net_http.o
+   endif
 endif
 
 ifneq ($(findstring Win32,$(OS)),)
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 45fe114269..d394016274 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -135,9 +135,9 @@ else
    check_lib DYLIB "$DYLIB" dlopen
 fi
 
-check_lib NETPLAY "$SOCKETLIB" socket "" "$SOCKETHEADER"
+check_lib NETWORK "$SOCKETLIB" socket "" "$SOCKETHEADER"
 
-if [ "$HAVE_NETPLAY" = 'yes' ]; then
+if [ "$HAVE_NETWORK" = 'yes' ]; then
    HAVE_GETADDRINFO=auto
    check_lib GETADDRINFO "$SOCKETLIB" getaddrinfo
    if [ "$HAVE_GETADDRINFO" = 'yes' ]; then
@@ -148,6 +148,7 @@ if [ "$HAVE_NETPLAY" = 'yes' ]; then
    HAVE_NETWORK_CMD='yes'
 else
    HAVE_NETWORK_CMD='no'
+   HAVE_NETPLAY='no'
 fi
 
 check_lib STDIN_CMD "$CLIB" fcntl
@@ -344,6 +345,6 @@ add_define_make OS "$OS"
 
 # Creates config.mk and config.h.
 add_define_make GLOBAL_CONFIG_DIR "$GLOBAL_CONFIG_DIR"
-VARS="RGUI LAKKA GLUI XMB ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL SDL2 D3D9 DINPUT WINXINPUT DSOUND XAUDIO OPENGL EXYNOS OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT"
+VARS="RGUI LAKKA GLUI XMB ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO PULSE SDL SDL2 D3D9 DINPUT WINXINPUT DSOUND XAUDIO OPENGL EXYNOS OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETWORK NETPLAY NETWORK_CMD STDIN_CMD COMMAND SOCKET_LEGACY FBO STRL STRCASESTR MMAP PYTHON FFMPEG_ALLOC_CONTEXT3 FFMPEG_AVCODEC_OPEN2 FFMPEG_AVIO_OPEN FFMPEG_AVFORMAT_WRITE_HEADER FFMPEG_AVFORMAT_NEW_STREAM FFMPEG_AVCODEC_ENCODE_AUDIO2 FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT"
 create_config_make config.mk $VARS
 create_config_header config.h $VARS
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 02dcc2f06c..75aa79fcf0 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -12,7 +12,8 @@ HAVE_GLES_CFLAGS=       # C-flags for custom GLES library
 HAVE_THREADS=auto       # Threading support
 HAVE_FFMPEG=auto        # Enable FFmpeg recording support
 HAVE_DYLIB=auto         # Enable dynamic loading support
-HAVE_NETPLAY=auto       # Enable netplay support
+HAVE_NETWORK=auto       # Enable networking features
+HAVE_NETPLAY=auto       # Enable netplay support (requires networking)
 HAVE_D3D9=yes           # Disable Direct3D 9 support
 HAVE_OPENGL=yes         # Disable OpenGL support
 HAVE_GLES=no            # Use GLESv2 instead of desktop GL