diff --git a/include/admin/comments.inc.php b/include/admin/comments.inc.php
index 8cae9962..130eb9a8 100644
--- a/include/admin/comments.inc.php
+++ b/include/admin/comments.inc.php
@@ -187,6 +187,9 @@ if ($serendipity['GET']['filter']['show'] == 'approved') {
 if ($serendipity['GET']['filter']['type'] == 'TRACKBACK') {
     $c_type = 'TRACKBACK';
     $searchString .= "&serendipity[filter][type]=TRACKBACK";
+} elseif ($serendipity['GET']['filter']['type'] == 'PINGBACK') {
+    $c_type = 'PINGBACK';
+    $searchString .= "&serendipity[filter][type]=PINGBACK";
 } elseif ($serendipity['GET']['filter']['type'] == 'NORMAL') {
     $c_type = 'NORMAL';
     $searchString .= "&serendipity[filter][type]=NORMAL";
@@ -197,6 +200,9 @@ if ($serendipity['GET']['filter']['type'] == 'TRACKBACK') {
 if ($serendipity['GET']['filter']['type'] == 'TRACKBACK') {
     $c_type = 'TRACKBACK';
     $searchString .= "&serendipity[filter][type]=TRACKBACK";
+} elseif ($serendipity['GET']['filter']['type'] == 'PINGBACK') {
+    $c_type = 'PINGBACK';
+    $searchString .= "&serendipity[filter][type]=PINGBACK";
 } elseif ($serendipity['GET']['filter']['type'] == 'NORMAL') {
     $c_type = 'NORMAL';
     $searchString .= "&serendipity[filter][type]=NORMAL";
@@ -314,6 +320,7 @@ function highlightComment(id, checkvalue) {
                 <option value=""><?php echo COMMENTS_FILTER_ALL ?></option>
                 <option value="NORMAL"<?php if ($c_type == 'NORMAL') echo ' selected="selected"' ?>><?php echo COMMENTS; ?></option>
                 <option value="TRACKBACK"<?php if ($c_type == 'TRACKBACK') echo ' selected="selected"' ?>><?php echo TRACKBACKS; ?></option>
+                <option value="PINGBACK"<?php if ($c_type == 'PINGBACK') echo ' selected="selected"' ?>><?php echo PINGBACKS; ?></option>
             </select></td>
     </tr>
     <tr>
diff --git a/include/functions_comments.inc.php b/include/functions_comments.inc.php
index 818c58ea..e0b46701 100644
--- a/include/functions_comments.inc.php
+++ b/include/functions_comments.inc.php
@@ -135,6 +135,8 @@ function serendipity_fetchComments($id, $limit = null, $order = '', $showAll = f
         $type = 'NORMAL';
     } elseif ($type == 'trackbacks') {
         $type = 'TRACKBACK';
+    } elseif ($type == 'pingbacks') {
+        $type = 'PINGBACK';
     } elseif ($type == 'comments_and_trackbacks') {
         $type = '%';
     }
diff --git a/lang/addlang.txt b/lang/addlang.txt
index c6632d49..d86529ee 100644
--- a/lang/addlang.txt
+++ b/lang/addlang.txt
@@ -1 +1,2 @@
-@define('CATEGORY_PLUGIN_HIDEZEROCOUNT', 'Hide archives link when no entries were made in that timespan (requires counting entries)');
+@define('PINGBACK', 'Pingback');
+@define('PINGBACKS', 'Pingbacks');