diff --git a/framework/Crypt/lib/Horde/Crypt/Pgp/Parse.php b/framework/Crypt/lib/Horde/Crypt/Pgp/Parse.php
index 052f308efb3..a1e36bd13be 100644
--- a/framework/Crypt/lib/Horde/Crypt/Pgp/Parse.php
+++ b/framework/Crypt/lib/Horde/Crypt/Pgp/Parse.php
@@ -57,8 +57,9 @@ class Horde_Crypt_Pgp_Parse
     const ARMOR_TEXT = 6;
 
     /**
-     * Metadata names for signature data.
+     * Metadata names for data.
      */
+    const PGP_ARMOR = 'pgp_armor'; /* @since 2.5.0 */
     const SIG_CHARSET = 'pgp_sig_charset';
     const SIG_RAW = 'pgp_sig_raw';
 
@@ -178,7 +179,7 @@ public function parseToPart($text, $charset = 'UTF-8')
             case self::ARMOR_MESSAGE:
                 $part = new Horde_Mime_Part();
                 $part->setType('multipart/encrypted');
-                $part->setMetadata(IMP_Mime_Viewer_Pgp::PGP_ARMOR, true);
+                $part->setMetadata(self::PGP_ARMOR, true);
                 $part->setContentTypeParameter('protocol', 'application/pgp-encrypted');
 
                 $part1 = new Horde_Mime_Part();
diff --git a/framework/Crypt/package.xml b/framework/Crypt/package.xml
index 3c664ea01a4..4480ec10d8e 100644
--- a/framework/Crypt/package.xml
+++ b/framework/Crypt/package.xml
@@ -18,8 +18,8 @@
  </lead>
  <date>2014-05-21</date>
  <version>
-  <release>2.4.4</release>
-  <api>2.4.0</api>
+  <release>2.5.0</release>
+  <api>2.5.0</api>
  </version>
  <stability>
   <release>stable</release>
@@ -27,7 +27,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Fix reference to constant outside of the package.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1024,15 +1024,15 @@ Initial release as a PEAR package
   </release>
   <release>
    <version>
-    <release>2.4.4</release>
-    <api>2.4.0</api></version>
+    <release>2.5.0</release>
+    <api>2.5.0</api></version>
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
    <date>2014-05-21</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Fix reference to constant outside of the package.
    </notes>
   </release>
  </changelog>