diff --git a/Makefile b/Makefile
index bae1767d48f43e18126f64a9921fddf4772bc56e..06c4b6b3765dd6102b9ff967a15ae97eb2ec3dd4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,5 +3,6 @@ help:
 	@grep -E "^[^ ]+:" Makefile | grep -v ^help
 
 docu-html:
+	which mkdocs 2>/dev/null >/dev/null || apt-get install mkdocs
 	mkdocs build	
 
diff --git a/doc/configuration/configuration-v1.7.md b/doc/configuration/configuration-v1.7.md
index a5d85d4aa16df973bae5ec875487c5c62cf7333a..1c30a0cf5e3cbe2f17d919fceec9ed791a1991c8 100644
--- a/doc/configuration/configuration-v1.7.md
+++ b/doc/configuration/configuration-v1.7.md
@@ -48,6 +48,15 @@ Subnets for which source or destination address will prevent rule creation and n
 
 	PROTECTED_SUBNETS = ['10.10.0.0/16']
 
+### Minimum Prefix Length for submitted FlowSpec rules
+
+IPv4 rules:
+
+	PREFIX_LENGTH = 29
+
+IPv6 rules:
+
+	PREFIX_LENGTH_IPV6 = 64 - (32 - 29)
 
 ### Database
 `DATABASES` should contain the database credentials:
@@ -104,7 +113,7 @@ We have to inform django about the device we set up earlier.
 
 	SNMP_CNTBYTES =     "1.3.6.1.4.1.2636.3.5.2.1.5" # OID of bytes counter (currently unused)
 	SNMP_CNTPACKETS =   "1.3.6.1.4.1.2636.3.5.2.1.4" # OID of packet counter
-	SNMP_RULESFILTER = ["__flowspec_default_inet__", "__flowspec_IAS_inet__"] # get only statistics of specified tables$
+	SNMP_RULESFILTER = ["__flowspec_default_inet__", "__flowspec_IAS_inet__", "__flowspec_default_inet6__", "__flowspec_IAS_inet6__"] # get only statistics of specified tables$
 	SNMP_POLL_INTERVAL = 8 #seconds # load new data into cache if it is older that a specified number of seconds
 	SNMP_TEMP_FILE = "/srv/flowspy/snmp_temp_data"
 	SNMP_POLL_LOCK = "/var/run/fod/snmppoll.lock"
@@ -200,6 +209,16 @@ attribute configuration:
 	SHIB_ENTITLEMENT_DISPLAY_NAME = "eduPersonEntitlement" # only needed for displaying the error message of missing attribute
 	SHIB_ENTITLEMENT_DISPLAY_ADDINFO = "urn:oid:1.3.6.1.4.1.5923.1.1.1.7; the value of this attribute also has to include 'urn:mace:example.com:pki:user'" # only needed for displaying the error message of missing attribute
 
+### Various Settings
+
+	TIME_ZONE = 'UTC'
+	LANGUAGE_CODE = 'en'
+	LANGUAGES = (
+		('el', _('Greek')),
+		('en', _('English')),
+	)
+
+
 ### Syncing the database
 To create all the tables needed by FoD we have to run the following commands: