diff --git a/docs/NEWS b/docs/NEWS
index c65fb6c9..6a885bb6 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.1 ()
 ------------------------------------------------------------------------
 
+    * Fix bug with using %username% in author permalinks, thanks to oeli
+      from the forums! (garvinhicking)
+
     * Fix possible integer wraparound in comment count leading to
       a gazillion counter state. Also now show links to the entries
       within the administration comment panel. Thanks to Julian Finn!
diff --git a/include/functions_entries.inc.php b/include/functions_entries.inc.php
index 765053e2..ac2e5db6 100644
--- a/include/functions_entries.inc.php
+++ b/include/functions_entries.inc.php
@@ -350,6 +350,7 @@ function &serendipity_fetchEntries($range = null, $full = true, $limit = '', $fe
                     e.last_modified,
 
                     a.realname AS author,
+                    a.username AS loginname,
                     a.email";
     }
 
@@ -962,7 +963,7 @@ function serendipity_printEntries($entries, $extended = 0, $preview = false, $sm
 
             $authorData = array(
                             'authorid' => $entry['authorid'],
-                            'username' => $entry['author'],
+                            'username' => $entry['loginname'],
                             'email'    => $entry['email'],
                             'realname' => $entry['author']
             );