diff --git a/fish/fish.c b/fish/fish.c
index a5fc337d2..894e351da 100644
--- a/fish/fish.c
+++ b/fish/fish.c
@@ -354,6 +354,11 @@ script (int prompt)
     while (*buf && isspace (*buf))
       buf++;
 
+    if (!*buf) continue;
+
+    /* If the next character is '#' then this is a comment. */
+    if (*buf == '#') continue;
+
     /* Get the command (cannot be quoted). */
     len = strcspn (buf, " \t");
 
diff --git a/guestfish.pod b/guestfish.pod
index 45a2854e2..0e9967fea 100644
--- a/guestfish.pod
+++ b/guestfish.pod
@@ -177,6 +177,18 @@ a space-separated list, enclosed in quotes.  For example:
 
  vgcreate VG "/dev/sda1 /dev/sdb1"
 
+=head1 COMMENTS
+
+Any line which starts with a I<#> character is treated as a comment
+and ignored.  The I<#> can optionally be preceeded by whitespace,
+but B<not> by a command.  For example:
+
+ # this is a comment
+         # this is a comment
+ foo # NOT a comment
+
+Blank lines are also ignored.
+
 =head1 COMMANDS
 
 =head2 help