diff --git a/progress/spinner.py b/progress/spinner.py
index 4e100ca..fe3801a 100644
--- a/progress/spinner.py
+++ b/progress/spinner.py
@@ -24,7 +24,9 @@ class Spinner(Infinite):
 
     def update(self):
         i = self.index % len(self.phases)
-        self.write(self.phases[i])
+        message = self.message % self
+        line = ''.join([message, self.phases[i]])
+        self.writeln(line)
 
 
 class PieSpinner(Spinner):
diff --git a/test_progress.py b/test_progress.py
index 356efd3..55f213e 100755
--- a/test_progress.py
+++ b/test_progress.py
@@ -33,7 +33,7 @@ for bar_cls in (IncrementalBar, PixelBar, ShadyBar):
             sleep()
 
 for spin in (Spinner, PieSpinner, MoonSpinner, LineSpinner, PixelSpinner):
-    for i in spin(spin.__name__ + ' ').iter(range(100)):
+    for i in spin(spin.__name__ + ' %(index) 3d ').iter(range(100)):
         sleep()
 
 for singleton in (Counter, Countdown, Stack, Pie):