diff --git a/pear/PEAR/Common.php b/pear/PEAR/Common.php
index 63696ed6303..105f691f141 100644
--- a/pear/PEAR/Common.php
+++ b/pear/PEAR/Common.php
@@ -331,6 +331,9 @@ class PEAR_Common extends PEAR
                 }
                 break;
             case 'file':
+                if ($this->in_changelog) {
+                    break;
+                }
                 if (isset($attribs['name'])) {
                     $path = '';
                     if (count($this->dir_names)) {
@@ -488,6 +491,9 @@ class PEAR_Common extends PEAR
                 array_pop($this->dir_names);
                 break;
             case 'file':
+                if ($this->in_changelog) {
+                    break;
+                }
                 if ($data) {
                     $path = '';
                     if (count($this->dir_names)) {