diff --git a/debian/changelog b/debian/changelog
index 625799c37..865193806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ linux-2.6 (2.6.32~rc8-1~experimental.1) UNRELEASED; urgency=low
   * r8169: Remove firmware for RTL8168D v1 and v2 and use
     request_firmware() to load it
   * DocBook: Fix build breakage
+  * Hide WPA authentication parameters and comments when including network
+    configuration in bug reports
 
   [ Bastian Blank ]
   * [mips] Don't force EMBEDDED on.
diff --git a/debian/templates/image.plain.bug/include-network b/debian/templates/image.plain.bug/include-network
index c5a64bd82..c3591c006 100644
--- a/debian/templates/image.plain.bug/include-network
+++ b/debian/templates/image.plain.bug/include-network
@@ -4,9 +4,9 @@ add_network() {
 
   echo '** Network interface configuration:' >&3
   # Hide passwords/keys
-  awk '$1 ~ /^wireless-key/ { gsub(".", "*", $2); }
+  awk '$1 ~ /key|pass|^wpa-(anonymous|identity|phase|pin|private|psk)/ { gsub(".", "*", $2); }
        $1 == "ethtool-wol" { gsub(".", "*", $3); }
-       { print; }
+       !/^[[:space:]]*\#/ { print; }
       ' </etc/network/interfaces >&3
   echo >&3
   echo '** Network status:' >&3