5 files changed, 10 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp
index 1a1e31c2f3..25756c4e6f 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -500,6 +500,12 @@ bool AppInit2()
                 SetLimited(net);
         }
     }
+#if defined(USE_IPV6)
+#if ! USE_IPV6
+    else
+        SetLimited(NET_IPV6);
+#endif
+#endif
 
     CService addrProxy;
     bool fProxy = false;
diff --git a/src/makefile.linux-mingw b/src/makefile.linux-mingw
index 059504b80f..ad74aa6c91 100644
--- a/src/makefile.linux-mingw
+++ b/src/makefile.linux-mingw
@@ -45,7 +45,7 @@ ifneq (${USE_UPNP}, -)
 endif
 
 ifneq (${USE_IPV6}, -)
-	DEFS += -DUSE_IPV6
+	DEFS += -DUSE_IPV6=$(USE_IPV6)
 endif
 
 LIBS += -l mingwthrd -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
diff --git a/src/makefile.mingw b/src/makefile.mingw
index 0bde965e1a..6102dad613 100644
--- a/src/makefile.mingw
+++ b/src/makefile.mingw
@@ -41,7 +41,7 @@ ifneq (${USE_UPNP}, -)
 endif
 
 ifneq (${USE_IPV6}, -)
-	DEFS += -DUSE_IPV6
+	DEFS += -DUSE_IPV6=$(USE_IPV6)
 endif
 
 LIBS += -l kernel32 -l user32 -l gdi32 -l comdlg32 -l winspool -l winmm -l shell32 -l comctl32 -l ole32 -l oleaut32 -l uuid -l rpcrt4 -l advapi32 -l ws2_32 -l mswsock -l shlwapi
diff --git a/src/makefile.osx b/src/makefile.osx
index d4109b9416..de829b9eb1 100644
--- a/src/makefile.osx
+++ b/src/makefile.osx
@@ -110,7 +110,7 @@ endif
 endif
 
 ifneq (${USE_IPV6}, -)
-	DEFS += -DUSE_IPV6
+	DEFS += -DUSE_IPV6=$(USE_IPV6)
 endif
 
 all: bitcoind
diff --git a/src/makefile.unix b/src/makefile.unix
index 81337148d3..ac42743d8e 100644
--- a/src/makefile.unix
+++ b/src/makefile.unix
@@ -45,7 +45,7 @@ ifneq (${USE_UPNP}, -)
 endif
 
 ifneq (${USE_IPV6}, -)
-	DEFS += -DUSE_IPV6
+	DEFS += -DUSE_IPV6=$(USE_IPV6)
 endif
 
 LIBS+= \