diff --git a/Makefile b/Makefile
index 59079a8b47..9646660bb1 100644
--- a/Makefile
+++ b/Makefile
@@ -974,7 +974,7 @@ depend:
 	@true # The include handles this automagically
 
 # Introduce the dependencies
-ifeq ($(findstring $(MAKECMDGOALS), clean info depend mrproper),)
+ifeq ($(findstring $(MAKECMDGOALS), clean info depend mrproper upgradeconf $(MAKE_CONFIG)),)
 -include $(DEPS)
 endif
 
diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection
index 93ae9172fd..213c62b76a 100644
--- a/makefiledir/Makefile.libdetection
+++ b/makefiledir/Makefile.libdetection
@@ -6,6 +6,8 @@ endif
 
 ifeq ($(shell expr $(CONFIG_VERSION) \< 9), 1)
 
+ifndef BYPASS_OS_DETECT
+
 # Automatically recognize if building on Win32
 ifdef WINDIR
 ifndef UNIX
@@ -56,6 +58,9 @@ SUNOS:=1
 UNIX:=1
 endif
 
+# END BYPASS_OS_DETECT
+endif
+
 # FreeBSD uses sdl11 instead of sdl
 ifdef FREEBSD
 SDL-CONFIG:=sdl11-config