diff --git a/docs/NEWS b/docs/NEWS
index 8101dbe5..e381bb22 100644
--- a/docs/NEWS
+++ b/docs/NEWS
@@ -3,6 +3,9 @@
 Version 1.3 ()
 ------------------------------------------------------------------------
 
+    * Made short-urls index.php?serendipity[id]=X or index.php?p=X
+      properly show a single entry view (garvinhicking)
+
     * Extended spam blocking plugin to handle pingbacks like trackbacks.
       (brockhaus)
 
diff --git a/index.php b/index.php
index 417f6ee8..3de482bd 100644
--- a/index.php
+++ b/index.php
@@ -250,10 +250,18 @@ if (preg_match(PAT_ARCHIVES, $uri, $matches) || isset($serendipity['GET']['range
 
     echo $data;
 } else if ( preg_match(PAT_COMMENTSUB, $uri, $matches) ||
-            preg_match(PAT_PERMALINK, $uri, $matches) ) {
+            preg_match(PAT_PERMALINK, $uri, $matches) ||
+            isset($serendipity['GET']['id']) ||
+            isset($_GET['p']) ) {
     $serendipity['view'] = 'entry';
 
-    $matches[1] = serendipity_searchPermalink($serendipity['permalinkStructure'], $uri, (!empty($matches[2]) ? $matches[2] : $matches[1]), 'entry');
+    if (isset($serendipity['GET']['id'])) {
+        $matches[1] = (int)$serendipity['GET']['id'];
+    } elseif (isset($_GET['p'])) {
+        $matches[1] = $_GET['p'];
+    } else {
+        $matches[1] = serendipity_searchPermalink($serendipity['permalinkStructure'], $uri, (!empty($matches[2]) ? $matches[2] : $matches[1]), 'entry');
+    }
     serendipity_rememberComment();
 
     if (!empty($serendipity['POST']['submit']) && !isset($_REQUEST['serendipity']['csuccess'])) {