diff --git a/Codec/Encryption/OpenPGP/Arbitrary.hs b/Codec/Encryption/OpenPGP/Arbitrary.hs
--- a/Codec/Encryption/OpenPGP/Arbitrary.hs
+++ b/Codec/Encryption/OpenPGP/Arbitrary.hs
@@ -87,7 +87,7 @@
 --
 
 instance Arbitrary PubKeyAlgorithm where
-    arbitrary = elements [RSA, DSA, EC, ECDSA, DH]
+    arbitrary = elements [RSA, DSA, ECDH, ECDSA, DH]
 
 instance Arbitrary EightOctetKeyId where
     arbitrary = vector 8 >>= return . EightOctetKeyId . B.pack
diff --git a/Codec/Encryption/OpenPGP/KeyInfo.hs b/Codec/Encryption/OpenPGP/KeyInfo.hs
--- a/Codec/Encryption/OpenPGP/KeyInfo.hs
+++ b/Codec/Encryption/OpenPGP/KeyInfo.hs
@@ -30,7 +30,7 @@
 pkalgoAbbrev ElgamalEncryptOnly = "g"
 pkalgoAbbrev DeprecatedRSAEncryptOnly = "-"
 pkalgoAbbrev DeprecatedRSASignOnly = "_"
-pkalgoAbbrev EC = "e"
+pkalgoAbbrev ECDH = "e"
 pkalgoAbbrev ECDSA = "E"
 pkalgoAbbrev ForbiddenElgamal = "f"
 pkalgoAbbrev DH = "d"
diff --git a/Codec/Encryption/OpenPGP/Types.hs b/Codec/Encryption/OpenPGP/Types.hs
--- a/Codec/Encryption/OpenPGP/Types.hs
+++ b/Codec/Encryption/OpenPGP/Types.hs
@@ -228,7 +228,7 @@
                      | DeprecatedRSASignOnly
                      | ElgamalEncryptOnly
                      | DSA
-                     | EC
+                     | ECDH
                      | ECDSA
                      | ForbiddenElgamal
                      | DH
@@ -247,7 +247,7 @@
     fromFVal DeprecatedRSASignOnly = 3
     fromFVal ElgamalEncryptOnly = 16
     fromFVal DSA = 17
-    fromFVal EC = 18
+    fromFVal ECDH = 18
     fromFVal ECDSA = 19
     fromFVal ForbiddenElgamal = 20
     fromFVal DH = 21
@@ -257,7 +257,7 @@
     toFVal 3 = DeprecatedRSASignOnly
     toFVal 16 = ElgamalEncryptOnly
     toFVal 17 = DSA
-    toFVal 18 = EC
+    toFVal 18 = ECDH
     toFVal 19 = ECDSA
     toFVal 20 = ForbiddenElgamal
     toFVal 21 = DH
diff --git a/hOpenPGP.cabal b/hOpenPGP.cabal
--- a/hOpenPGP.cabal
+++ b/hOpenPGP.cabal
@@ -1,5 +1,5 @@
 Name:                hOpenPGP
-Version:             1.5.1
+Version:             1.5.2
 Synopsis:            native Haskell implementation of OpenPGP (RFC4880)
 Description:         native Haskell implementation of OpenPGP (RFC4880)
 Homepage:            http://floss.scru.org/hOpenPGP/
@@ -173,7 +173,7 @@
                , bzlib
                , cereal
                , cereal-conduit        >= 0.6    && < 0.8
-               , conduit               >= 0.5    && < 1.2
+               , conduit               >= 0.5    && < 1.3
                , conduit-extra         >= 1.1
                , containers
                , crypto-cipher-types
@@ -255,4 +255,4 @@
 source-repository this
   type:     git
   location: git://git.debian.org/users/clint/hOpenPGP.git
-  tag:      v1.5.1
+  tag:      v1.5.2