diff --git a/Makefile.common b/Makefile.common
index ef0e3b6853..37f8920246 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -156,7 +156,6 @@ OBJ += frontend/frontend.o \
 		libretro-common/queues/message_queue.o \
 		rewind.o \
 		gfx/drivers_font_renderer/bitmapfont.o \
-		gfx/drivers_font_renderer/stb.o \
 		input/input_autodetect.o \
 		input/input_joypad_driver.o \
 		input/input_joypad.o \
@@ -435,6 +434,10 @@ ifeq ($(HAVE_MENU_COMMON), 1)
 			 menu/drivers/null.o
 endif
 
+ifeq ($(HAVE_STB_FONT), 1)
+   OBJ += gfx/drivers_font_renderer/stb.o
+endif
+
 ifeq ($(HAVE_FREETYPE), 1)
    OBJ += gfx/drivers_font_renderer/freetype.o
    LIBS += $(FREETYPE_LIBS)
diff --git a/Makefile.win b/Makefile.win
index 763058a789..5497ebbc37 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -27,6 +27,7 @@ HAVE_SDL2     := 0
 HAVE_RSOUND   := 0
 HAVE_PYTHON   := 0
 
+HAVE_STB_FONT := 1
 HAVE_FREETYPE := 1
 HAVE_FFMPEG   := 0
 
diff --git a/gfx/font_renderer_driver.c b/gfx/font_renderer_driver.c
index ddd0b0f4e0..a2fd02a09b 100644
--- a/gfx/font_renderer_driver.c
+++ b/gfx/font_renderer_driver.c
@@ -28,7 +28,9 @@ static const font_renderer_driver_t *font_backends[] = {
 #if defined(__APPLE__) && defined(HAVE_CORETEXT)
    &coretext_font_renderer,
 #endif
+#ifdef HAVE_STB_FONT
    &stb_font_renderer,
+#endif
    &bitmap_font_renderer,
    NULL
 };
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index c5b34db990..510c30276b 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -404,6 +404,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 CORETEXT PULSE SDL SDL2 D3D9 DINPUT LIBUSB XINPUT DSOUND XAUDIO OPENGL EXYNOS DISPMANX SUNXI 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 NETWORKING 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 SWRESAMPLE FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT IMAGEVIEWER COCOA AVFOUNDATION CORELOCATION IOHIDMANAGER LIBRETRODB"
+VARS="RGUI LAKKA GLUI XMB ALSA OSS OSS_BSD OSS_LIB AL RSOUND ROAR JACK COREAUDIO CORETEXT PULSE SDL SDL2 D3D9 DINPUT LIBUSB XINPUT DSOUND XAUDIO OPENGL EXYNOS DISPMANX SUNXI OMAP GLES GLES3 VG EGL KMS GBM DRM DYLIB GETOPT_LONG THREADS CG LIBXML2 ZLIB DYNAMIC FFMPEG AVCODEC AVFORMAT AVUTIL SWSCALE FREETYPE STB_FONT XKBCOMMON XVIDEO X11 XEXT XF86VM XINERAMA WAYLAND MALI_FBDEV VIVANTE_FBDEV NETWORKING 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 SWRESAMPLE FFMPEG_AVCODEC_ENCODE_VIDEO2 BSV_MOVIE VIDEOCORE NEON FLOATHARD FLOATSOFTFP UDEV V4L2 AV_CHANNEL_LAYOUT 7ZIP PARPORT IMAGEVIEWER COCOA AVFOUNDATION CORELOCATION IOHIDMANAGER LIBRETRODB"
 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 dca2ab8bc0..67d1b96a09 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -44,6 +44,7 @@ HAVE_JACK=auto          # Enable JACK support
 HAVE_COREAUDIO=auto     # Enable CoreAudio support
 HAVE_PULSE=auto         # Enable PulseAudio support
 HAVE_FREETYPE=auto      # Enable FreeType support
+HAVE_STB_FONT=yes       # Disable stb_truetype font support
 HAVE_XVIDEO=auto        # Enable XVideo support
 HAVE_PYTHON=auto        # Enable Python 3 support for shaders
 HAVE_V4L2=auto          # Enable video4linux2 support