diff --git a/ChangeLog b/ChangeLog
index 9400bf5..01aa375 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-05-30  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/test/test_common_program.py:
+	  Add a test for the template in #66.
+
 2011-05-30  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/rip/cd.py:
diff --git a/morituri/test/test_common_program.py b/morituri/test/test_common_program.py
index e67f01a..1c72b01 100644
--- a/morituri/test/test_common_program.py
+++ b/morituri/test/test_common_program.py
@@ -98,4 +98,15 @@ class PathTestCase(unittest.TestCase):
         path = prog.getPath(u'/tmp', cd.DEFAULT_DISC_TEMPLATE, 'mbdiscid', 0)
         self.assertEquals(path,
             u'/tmp/Jeff Buckley - Grace/Jeff Buckley - Grace')
+
+    def testIssue66TemplateFilled(self):
+        prog = program.Program()
+        md = program.DiscMetadata()
+        md.artist = md.sortName = 'Jeff Buckley'
+        md.title = 'Grace'
+        prog.metadata = md
+
+        path = prog.getPath(u'/tmp', u'%A/%d', 'mbdiscid', 0)
+        self.assertEquals(path,
+            u'/tmp/Jeff Buckley/Grace')