diff --git a/beets/library.py b/beets/library.py
index 92e02641b..44fcb6b86 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -16,12 +16,12 @@ import sqlite3
 import os
 import re
 import sys
-from string import Template
 import logging
 from beets.mediafile import MediaFile
 from beets import plugins
 from beets import util
 from beets.util import bytestring_path, syspath, normpath, samefile
+from beets.util.functemplate import Template
 
 MAX_FILENAME_LENGTH = 200
 
diff --git a/docs/reference/config.rst b/docs/reference/config.rst
index fc0d314d8..b1a5a98a8 100644
--- a/docs/reference/config.rst
+++ b/docs/reference/config.rst
@@ -156,7 +156,7 @@ Here's an example file::
     default: $genre/$albumartist/$album/$track $title
     soundtrack: Soundtracks/$album/$track $title
     comp: $genre/$album/$track $title
-    singleton: Singletons/$artist - $track
+    singleton: Singletons/$artist - $title
 
     [bpd]
     host: 127.0.0.1