diff --git a/debian/tvheadend.default b/debian/tvheadend.default
index 4d919538..4617c07b 100644
--- a/debian/tvheadend.default
+++ b/debian/tvheadend.default
@@ -25,6 +25,10 @@ TVH_CONF_DIR=""
 #   set as "0,1"
 TVH_ADAPTERS=""
 
+# TVH_IPV6
+#   if set to 1 will enable IPv6 support
+TVH_IPV6=0
+
 # TVH_HTTP_PORT
 #   if set to "" will use binary default
 TVH_HTTP_PORT=""
diff --git a/debian/tvheadend.init b/debian/tvheadend.init
index 9e3bcb97..1fe83698 100644
--- a/debian/tvheadend.init
+++ b/debian/tvheadend.init
@@ -33,6 +33,7 @@ ARGS="-f"
 [ -z "$TVH_GROUP"     ] || ARGS="$ARGS -g $TVH_GROUP"
 [ -z "$TVH_CONF_DIR"  ] || ARGS="$ARGS -c $TVH_CONF_DIR"
 [ -z "$TVH_ADAPTERS"  ] || ARGS="$ARGS -a $TVH_ADAPTERS"
+[ "$TVH_IPV6" == "1"  ] && ARGS="$ARGS -6"
 [ -z "$TVH_HTTP_PORT" ] || ARGS="$ARGS --http_port $TVH_HTTP_PORT"
 [ -z "$TVH_HTTP_ROOT" ] || ARGS="$ARGS --http_root $TVH_HTTP_ROOT"
 [ -z "$TVH_HTSP_PORT" ] || ARGS="$ARGS --htsp_port $TVH_HTSP_PORT"
diff --git a/debian/tvheadend.upstart b/debian/tvheadend.upstart
index 5b8b6512..9fe9baf7 100644
--- a/debian/tvheadend.upstart
+++ b/debian/tvheadend.upstart
@@ -22,6 +22,7 @@ script
   [ -z "$TVH_GROUP"     ] || ARGS="$ARGS -g $TVH_GROUP"
   [ -z "$TVH_CONF_DIR"  ] || ARGS="$ARGS -c $TVH_CONF_DIR"
   [ -z "$TVH_ADAPTERS"  ] || ARGS="$ARGS -a $TVH_ADAPTERS"
+  [ "$TVH_IPV6" == "1"  ] && ARGS="$ARGS -6"
   [ -z "$TVH_HTTP_PORT" ] || ARGS="$ARGS --http_port $TVH_HTTP_PORT"
   [ -z "$TVH_HTTP_ROOT" ] || ARGS="$ARGS --http_root $TVH_HTTP_ROOT"
   [ -z "$TVH_HTSP_PORT" ] || ARGS="$ARGS --htsp_port $TVH_HTSP_PORT"