diff --git a/ceo/urwid/library.py b/ceo/urwid/library.py
index 64d09c7..40e3690 100644
--- a/ceo/urwid/library.py
+++ b/ceo/urwid/library.py
@@ -284,6 +284,10 @@ class SearchPage(urwid.WidgetWrap):
             for s in st:
                 books.append(s.book)
 
+        if not books.count():
+            widgets.append(urwid.Text("No results. Hit ESC to return to search page."))
+            widgets.append(urwid.Divider())
+
         for b in books:
             widgets.append(urwid.AttrWrap(ButtonText(self.select, b, str(b)),
                                           None, 'selected'))
diff --git a/debian/changelog b/debian/changelog
index 8867706..d84833d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ceo (0.5.9+nmu1) stable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix library book search page to display message when no books are found.
+
+ -- Marc Burns <m4burns@csclub.uwaterloo.ca>  Mon, 28 Feb 2011 13:00:24 -0500
+
 ceo (0.5.9) stable; urgency=low
 
   * Fix build for squeeze.