diff --git a/forked-daapd.conf b/forked-daapd.conf
index bf056f14..b4c530c7 100644
--- a/forked-daapd.conf
+++ b/forked-daapd.conf
@@ -9,6 +9,8 @@ general {
 	loglevel = log
 	# Admin password for the non-existent web interface
 	admin_password = "unused"
+	# Enable/disable IPv6
+	ipv6 = no
 }
 
 # Library configuration
diff --git a/src/conffile.c b/src/conffile.c
index 589380a8..030a1161 100644
--- a/src/conffile.c
+++ b/src/conffile.c
@@ -47,6 +47,7 @@ static cfg_opt_t sec_general[] =
     CFG_STR("logfile", STATEDIR "/log/" PACKAGE ".log", CFGF_NONE),
     CFG_STR("db_path", STATEDIR "/cache/" PACKAGE "/songs3.db", CFGF_NONE),
     CFG_INT_CB("loglevel", E_LOG, CFGF_NONE, &cb_loglevel),
+    CFG_BOOL("ipv6", cfg_true, CFGF_NONE),
     CFG_END()
   };