diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py
index 780ba428209..dbf13454203 100644
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -68,7 +68,8 @@ def parse_line(n, line):
 
   match = re.match(r"([ST]) (\d{4}-\d{2}-\d{2}) ([a-fA-F\d]+)\s*$", line);
   if (not match):
-    raise Exception("%s:%d:E syntax error" % (snapshotfile, n))
+    raise Exception("%s:%d:%s:E syntax error: line = %s"
+                       % (snapshotfile, n, hash, line))
   return {"type": "snapshot",
           "date": match.group(2),
           "rev": match.group(3)}
diff --git a/src/snapshots.txt b/src/snapshots.txt
index 9ba0c82465f..6037a2d4958 100644
--- a/src/snapshots.txt
+++ b/src/snapshots.txt
@@ -1,10 +1,10 @@
 S 2012-10-07 d301dd3
-  macos-i386     c9dfce9f231f22969b7e7995c1f39fcf86f81b2b
-  macos-x86_64   3b1f6fd43fe03d7af334eeb111bc384428c4cd3d
+  macos-i386 c9dfce9f231f22969b7e7995c1f39fcf86f81b2b
+  macos-x86_64 3b1f6fd43fe03d7af334eeb111bc384428c4cd3d
   freebsd-x86_64 784ac161fee0351281e3edfefc81a0c1b5d068b5
-  linux-i386     4d945d7e0de4e4544928ed5aa111d1508522c697
-  linux-x86_64   9bea5436042dd4bb7e682d3a10d0d51c3590b531
-  winnt-i386     62de5eea3eba70a2f4a2b4d42c72aa2fa75f999a
+  linux-i386 4d945d7e0de4e4544928ed5aa111d1508522c697
+  linux-x86_64 9bea5436042dd4bb7e682d3a10d0d51c3590b531
+  winnt-i386 62de5eea3eba70a2f4a2b4d42c72aa2fa75f999a
 
 S 2012-10-05 937f8f4
   macos-i386 8b5ddc78b3004e539c6fbe224e492e4a6a1bc867