diff --git a/modules/services/mail/postfix.nix b/modules/services/mail/postfix.nix
index 3a28e81eb15..2cb07bd05c0 100644
--- a/modules/services/mail/postfix.nix
+++ b/modules/services/mail/postfix.nix
@@ -21,7 +21,7 @@ let
       default_privs = nobody
 
     ''
-    + optionalString (config.services.gw6c.enable || config.networking.nativeIPv6) (''
+    + optionalString (config.services.gw6c.enable || config.networking.enableIPv6) (''
       inet_protocols = all
     '')
     + (if cfg.networks != null then
diff --git a/modules/tasks/network-interfaces.nix b/modules/tasks/network-interfaces.nix
index 640ef0821fc..6c92e499c07 100644
--- a/modules/tasks/network-interfaces.nix
+++ b/modules/tasks/network-interfaces.nix
@@ -26,11 +26,10 @@ in
       '';
     };
 
-    networking.nativeIPv6 = mkOption {
-      default = false;
+    networking.enableIPv6 = mkOption {
+      default = true;
       description = ''
-        Whether to use IPv6 even though gw6c is not used. For example, 
-        for Postfix.
+        Whether to enable support for IPv6.
       '';
     };
 
@@ -145,6 +144,8 @@ in
 
   config = {
 
+    boot.kernelModules = optional cfg.enableIPv6 "ipv6";
+
     environment.systemPackages =
       [ pkgs.host
         pkgs.iproute