diff --git a/docs/NEWS b/docs/NEWS
index a9d5a366..95270f47 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.5 ()
 ------------------------------------------------------------------------
 
+    * Filter entries only by authors that have written at least
+      one article (garvinhicking)
+      
     * Fix PDF imagemagick thumbnail generation to be properly displayed
       (http://board.s9y.org/viewtopic.php?f=3&t=15446)
       
diff --git a/include/admin/entries.inc.php b/include/admin/entries.inc.php
index aa3721ad..43fb596a 100644
--- a/include/admin/entries.inc.php
+++ b/include/admin/entries.inc.php
@@ -113,9 +113,10 @@ function serendipity_drawList() {
                 <select name="serendipity[filter][author]">
                     <option value="">--</option>
 <?php
-                    $users = serendipity_fetchUsers();
+                    $users = serendipity_fetchUsers('', null, true);
                     if (is_array($users)) {
                         foreach ($users AS $user) {
+                            if (isset($user['artcount']) && $user['artcount'] < 1) continue;
                             echo '<option value="' . $user['authorid'] . '" ' . (isset($serendipity['GET']['filter']['author']) && $serendipity['GET']['filter']['author'] == $user['authorid'] ? 'selected="selected"' : '') . '>' . htmlspecialchars($user['realname']) . '</option>' . "\n";
                         }
                     }