diff --git a/QC.hs b/QC.hs
--- a/QC.hs
+++ b/QC.hs
@@ -24,6 +24,7 @@
 import Test.QuickCheck
 
 import qualified Codec.Binary.Uu as Uu
+import qualified Codec.Binary.Base85 as Base85
 import qualified Codec.Binary.Base64 as Base64
 import qualified Codec.Binary.Base64Url as Base64Url
 import qualified Codec.Binary.Base32 as Base32
@@ -55,6 +56,13 @@
 prop_uuCombined ws = ws == (fromJust $ Uu.decode $ Uu.unchop $ Uu.chop 45 $ Uu.encode ws)
     where types = ws::[Word8]
 
+-- {{{1 base85 properties
+prop_base85Encode ws = ws == (fromJust $ Base85.decode $ Base85.encode ws)
+    where types = ws::[Word8]
+
+prop_base85Chop s = s == (Base85.unchop $ Base85.chop 20 s)
+    where types = s::String
+
 -- {{{1 base64 properties
 prop_base64Encode ws = ws == (fromJust $ Base64.decode $ Base64.encode ws)
     where types = ws::[Word8]
@@ -95,6 +103,8 @@
     quickCheck prop_uuEncode
     quickCheck prop_uuChop
     quickCheck prop_uuCombined
+    quickCheck prop_base85Encode
+    quickCheck prop_base85Chop
     quickCheck prop_base64Encode
     quickCheck prop_base64Chop
     quickCheck prop_base64UrlEncode
diff --git a/UT.hs b/UT.hs
--- a/UT.hs
+++ b/UT.hs
@@ -55,6 +55,28 @@
     , "uu decode' illegal" ~: [Nothing] ~=? decode' uu "aa"
     ]
 
+-- {{{1 base85 tests
+base85TestData =
+    [ ("base85", "empty", "", [], base85)
+    , ("base85", "f", "Ac", [102], base85)
+    , ("base85", "fo", "Ao@", [102,111], base85)
+    , ("base85", "foo", "AoDS", [102,111,111], base85)
+    , ("base85", "foob", "AoDTs", [102,111,111,98], base85)
+    , ("base85", "fooba", "AoDTs@/", [102,111,111,98,97], base85)
+    , ("base85", "foobar", "AoDTs@<)", [102,111,111,98,97,114], base85)
+    , ("base85", "\0", "!!", [0], base85)
+    , ("base85", "foob\0\0\0\0ar", "AoDTszEW", [102,111,111,98,0,0,0,0,114], base85)
+    , ("base85", "Example", "7<i6XE,9(", [69,120,97,109,112,108,101], base85)
+    ]
+base85Tests = buildTestList base85TestData
+
+base85TestsFail = test
+    [ "base85 decode short" ~: Nothing ~=? decode base85 "A"
+    , "base85 decode' short" ~: [Nothing] ~=? decode' base85 "A"
+    , "base85 decode illegal" ~: Nothing ~=? decode base85 "!z"
+    , "base85 decode' illegal" ~: [Nothing] ~=? decode' base85 "!z"
+    ]
+
 -- {{{1 base64 tests
 base64TestData =
     [ ("base64", "empty", "", [], base64)
@@ -64,8 +86,8 @@
     , ("base64", "foob", "Zm9vYg==", [102,111,111,98], base64)
     , ("base64", "fooba", "Zm9vYmE=", [102,111,111,98,97], base64)
     , ("base64", "foobar", "Zm9vYmFy", [102,111,111,98,97,114], base64)
-    , ("base64url", "\0", "AA==", [0], base64)
-    , ("base64url", "\255", "/w==", [255], base64)
+    , ("base64", "\0", "AA==", [0], base64)
+    , ("base64", "\255", "/w==", [255], base64)
     , ("base64", "Example", "RXhhbXBsZQ==", [69,120,97,109,112,108,101], base64)
     ]
 base64Tests = buildTestList base64TestData
@@ -146,6 +168,7 @@
 -- {{{1 test list and main
 testList = TestList
     [ uuTests, uuTests2, uuTestsFail
+    , base85Tests, base85TestsFail
     , base64Tests, base64TestsFail
     , base64UrlTests
     , base32Tests, base32TestsFail
diff --git a/dataenc.cabal b/dataenc.cabal
--- a/dataenc.cabal
+++ b/dataenc.cabal
@@ -1,15 +1,16 @@
 name: dataenc
-version: 0.10.2
+version: 0.11
 license: LGPL
 license-file: COPYING.LESSER
 cabal-version: >= 1.2
+build-type: Simple
 author: Magnus Therning
 maintainer: magnus@therning.org
 copyright: Magnus Therning, 2007
 category: Codec
 synopsis: Data encoding library
 description: Data encoding library currently providing Uuencode, Base64,
-        Base64Url, Base32, Base32Hex, and Base16.
+        Base64Url, Base32, Base32Hex, Base16, and Base85.
 extra-source-files: UT.hs QC.hs COPYING
 
 flag large_base
@@ -30,3 +31,4 @@
                 Codec.Binary.Uu
                 Codec.Binary.Base64Url
                 Codec.Binary.Base64
+                Codec.Binary.Base85
diff --git a/src/Codec/Binary/Base16.hs b/src/Codec/Binary/Base16.hs
--- a/src/Codec/Binary/Base16.hs
+++ b/src/Codec/Binary/Base16.hs
@@ -35,21 +35,20 @@
 import Data.Word
 import qualified Data.Map as M
 
+-- {{{1 enc/dec map
+_encMap =
+    [ (0, '0'), (1, '1'), (2, '2'), (3, '3'), (4, '4')
+    , (5, '5'), (6, '6'), (7, '7'), (8, '8'), (9, '9')
+    , (10, 'A'), (11, 'B'), (12, 'C'), (13, 'D'), (14, 'E')
+    , (15, 'F') ]
+
 -- {{{1 encodeArray
 encodeArray :: Array Word8 Char
-encodeArray = array (0, 64) [
-    (0, '0'), (1, '1'), (2, '2'), (3, '3'), (4, '4'),
-    (5, '5'), (6, '6'), (7, '7'), (8, '8'), (9, '9'),
-    (10, 'A'), (11, 'B'), (12, 'C'), (13, 'D'), (14, 'E'),
-    (15, 'F') ]
+encodeArray = array (0, 64) _encMap
 
 -- {{{1 decodeMap
 decodeMap :: M.Map Char Word8
-decodeMap  = M.fromList [
-    ('0', 0), ('1', 1), ('2', 2), ('3', 3), ('4', 4),
-    ('5', 5), ('6', 6), ('7', 7), ('8', 8), ('9', 9),
-    ('A', 10), ('B', 11), ('C', 12), ('D', 13), ('E', 14),
-    ('F', 15) ]
+decodeMap  = M.fromList [(snd i, fst i) | i <- _encMap]
 
 -- {{{1 encode
 -- | Encode data.
diff --git a/src/Codec/Binary/Base32.hs b/src/Codec/Binary/Base32.hs
--- a/src/Codec/Binary/Base32.hs
+++ b/src/Codec/Binary/Base32.hs
@@ -35,92 +35,58 @@
 import Data.Word
 import qualified Data.Map as M
 
+-- {{{1 enc/dec map
+_encMap =
+    [ (0, 'A'), (1, 'B'), (2, 'C'), (3, 'D'), (4, 'E')
+    , (5, 'F'), (6, 'G'), (7, 'H'), (8, 'I'), (9, 'J')
+    , (10, 'K'), (11, 'L'), (12, 'M'), (13, 'N'), (14, 'O')
+    , (15, 'P'), (16, 'Q'), (17, 'R'), (18, 'S'), (19, 'T')
+    , (20, 'U'), (21, 'V'), (22, 'W'), (23, 'X'), (24, 'Y')
+    , (25, 'Z'), (26, '2'), (27, '3'), (28, '4'), (29, '5')
+    , (30, '6'), (31, '7') ]
+
 -- {{{1 encodeArray
 encodeArray :: Array Word8 Char
-encodeArray = array (0, 32) [
-    (0, 'A'), (1, 'B'), (2, 'C'), (3, 'D'), (4, 'E'),
-    (5, 'F'), (6, 'G'), (7, 'H'), (8, 'I'), (9, 'J'),
-    (10, 'K'), (11, 'L'), (12, 'M'), (13, 'N'), (14, 'O'),
-    (15, 'P'), (16, 'Q'), (17, 'R'), (18, 'S'), (19, 'T'),
-    (20, 'U'), (21, 'V'), (22, 'W'), (23, 'X'), (24, 'Y'),
-    (25, 'Z'), (26, '2'), (27, '3'), (28, '4'), (29, '5'),
-    (30, '6'), (31, '7') ]
+encodeArray = array (0, 32) _encMap
 
 -- {{{1 decodeMap
 decodeMap :: M.Map Char Word8
-decodeMap = M.fromList [
-    ('A', 0), ('B', 1), ('C', 2), ('D', 3), ('E', 4),
-    ('F', 5), ('G', 6), ('H', 7), ('I', 8), ('J', 9),
-    ('K', 10), ('L', 11), ('M', 12), ('N', 13), ('O', 14),
-    ('P', 15), ('Q', 16), ('R', 17), ('S', 18), ('T', 19),
-    ('U', 20), ('V', 21), ('W', 22), ('X', 23), ('Y', 24),
-    ('Z', 25), ('2', 26), ('3', 27), ('4', 28), ('5', 29),
-    ('6', 30), ('7', 31) ]
+decodeMap = M.fromList [(snd i, fst i) | i <- _encMap]
 
 -- {{{1 encode
 -- | Encode data.
 encode :: [Word8]
     -> String
-encode [] = ""
-encode [o] = let
-        i1 = o `shiftR` 3
-        i2 = o `shiftL` 2 .&. 0x1f
-    in (encodeArray ! i1) : (encodeArray ! i2) : "======"
-encode [o1, o2] = let
-        i1 = o1 `shiftR` 3
-        i2 = (o1 `shiftL` 2 .|. o2 `shiftR` 6) .&. 0x1f
-        i3 = o2 `shiftR` 1 .&. 0x1f
-        i4 = o2 `shiftL` 4 .&. 0x1f
-    in foldr (\ i s -> (encodeArray ! i) : s) "====" [i1, i2, i3, i4]
-encode [o1, o2, o3] = let
-        i1 = o1 `shiftR` 3
-        i2 = (o1 `shiftL` 2 .|. o2 `shiftR` 6) .&. 0x1f
-        i3 = o2 `shiftR` 1 .&. 0x1f
-        i4 = (o2 `shiftL` 4 .|. o3 `shiftR` 4) .&. 0x1f
-        i5 = o3 `shiftL` 1 .&. 0x1f
-    in foldr (\ i s -> (encodeArray ! i) : s) "===" [i1, i2, i3, i4, i5]
-encode [o1, o2, o3, o4] = let
-        i1 = o1 `shiftR` 3
-        i2 = (o1 `shiftL` 2 .|. o2 `shiftR` 6) .&. 0x1f
-        i3 = o2 `shiftR` 1 .&. 0x1f
-        i4 = (o2 `shiftL` 4 .|. o3 `shiftR` 4) .&. 0x1f
-        i5 = (o3 `shiftL` 1 .|. o4 `shiftR` 7) .&. 0x1f
-        i6 = o4 `shiftR` 2 .&. 0x1f
-        i7 = o4 `shiftL` 3 .&. 0x1f
-    in foldr (\ i s -> (encodeArray ! i) : s) "=" [i1, i2, i3, i4, i5, i6, i7]
-encode (o1:o2:o3:o4:o5:os) = let
-        i1 = o1 `shiftR` 3
-        i2 = (o1 `shiftL` 2 .|. o2 `shiftR` 6) .&. 0x1f
-        i3 = o2 `shiftR` 1 .&. 0x1f
-        i4 = (o2 `shiftL` 4 .|. o3 `shiftR` 4) .&. 0x1f
-        i5 = (o3 `shiftL` 1 .|. o4 `shiftR` 7) .&. 0x1f
-        i6 = o4 `shiftR` 2 .&. 0x1f
-        i7 = (o4 `shiftL` 3 .|. o5 `shiftR` 5) .&. 0x1f
-        i8 = o5 .&. 0x1f
-    in (foldr (\ i s -> (encodeArray ! i) : s) "" [i1, i2, i3, i4, i5, i6, i7, i8]) ++ (encode os)
+encode = let
+        pad n = take n $ repeat 0
+        enc [] = ""
+        enc l@[o] = (++ "======") . take 2 . enc $ l ++ pad 4
+        enc l@[o1, o2] = (++ "====") . take 4 . enc $ l ++ pad 3
+        enc l@[o1, o2, o3] = (++ "===") . take 5 . enc $ l ++ pad 2
+        enc l@[o1, o2, o3, o4] = (++ "=") . take 7 . enc $ l ++ pad 1
+        enc (o1:o2:o3:o4:o5:os) = let
+                i1 = o1 `shiftR` 3
+                i2 = (o1 `shiftL` 2 .|. o2 `shiftR` 6) .&. 0x1f
+                i3 = o2 `shiftR` 1 .&. 0x1f
+                i4 = (o2 `shiftL` 4 .|. o3 `shiftR` 4) .&. 0x1f
+                i5 = (o3 `shiftL` 1 .|. o4 `shiftR` 7) .&. 0x1f
+                i6 = o4 `shiftR` 2 .&. 0x1f
+                i7 = (o4 `shiftL` 3 .|. o5 `shiftR` 5) .&. 0x1f
+                i8 = o5 .&. 0x1f
+            in (foldr (\ i s -> (encodeArray ! i) : s) "" [i1, i2, i3, i4, i5, i6, i7, i8]) ++ (enc os)
+    in enc
 
 -- {{{1 decode
 -- | Decode data (lazy).
 decode' :: String
     -> [Maybe Word8]
 decode' = let
+        pad n = take n $ repeat $ Just 0
         dec [] = []
-        dec [Just eo1, Just eo2] = [Just (eo1 `shiftL` 3 .|. eo2 `shiftR` 2)]
-        dec [Just eo1, Just eo2, Just eo3, Just eo4] = let
-                o1 = eo1 `shiftL` 3 .|. eo2 `shiftR` 2
-                o2 = eo2 `shiftL` 6 .|. eo3 `shiftL` 1 .|. eo4 `shiftR` 4
-            in [Just o1, Just o2]
-        dec [Just eo1, Just eo2, Just eo3, Just eo4, Just eo5] = let
-                o1 = eo1 `shiftL` 3 .|. eo2 `shiftR` 2
-                o2 = eo2 `shiftL` 6 .|. eo3 `shiftL` 1 .|. eo4 `shiftR` 4
-                o3 = eo4 `shiftL` 4 .|. eo5 `shiftR` 1
-            in [Just o1, Just o2, Just o3]
-        dec [Just eo1, Just eo2, Just eo3, Just eo4, Just eo5, Just eo6, Just eo7] = let
-                o1 = eo1 `shiftL` 3 .|. eo2 `shiftR` 2
-                o2 = eo2 `shiftL` 6 .|. eo3 `shiftL` 1 .|. eo4 `shiftR` 4
-                o3 = eo4 `shiftL` 4 .|. eo5 `shiftR` 1
-                o4 = eo5 `shiftL` 7 .|. eo6 `shiftL` 2 .|. eo7 `shiftR` 3
-            in [Just o1, Just o2, Just o3, Just o4]
+        dec l@[Just eo1, Just eo2] = take 1 . dec $ l ++ pad 6
+        dec l@[Just eo1, Just eo2, Just eo3, Just eo4] = take 2 . dec $ l ++ pad 4
+        dec l@[Just eo1, Just eo2, Just eo3, Just eo4, Just eo5] = take 3 . dec $ l ++ pad 3
+        dec l@[Just eo1, Just eo2, Just eo3, Just eo4, Just eo5, Just eo6, Just eo7] = take 4 . dec $ l ++ pad 1
         dec (Just eo1:Just eo2:Just eo3:Just eo4:Just eo5:Just eo6:Just eo7:Just eo8:eos) = let
                 o1 = eo1 `shiftL` 3 .|. eo2 `shiftR` 2
                 o2 = eo2 `shiftL` 6 .|. eo3 `shiftL` 1 .|. eo4 `shiftR` 4
diff --git a/src/Codec/Binary/Base32Hex.hs b/src/Codec/Binary/Base32Hex.hs
--- a/src/Codec/Binary/Base32Hex.hs
+++ b/src/Codec/Binary/Base32Hex.hs
@@ -37,93 +37,58 @@
 
 import qualified Codec.Binary.Base32 as Base32
 
+-- {{{1 enc/dec map
+_encMap =
+    [ (0, '0'), (1, '1'), (2, '2'), (3, '3'), (4, '4')
+    , (5, '5'), (6, '6'), (7, '7'), (8, '8'), (9, '9')
+    , (10, 'A'), (11, 'B'), (12, 'C'), (13, 'D'), (14, 'E')
+    , (15, 'F'), (16, 'G'), (17, 'H'), (18, 'I'), (19, 'J')
+    , (20, 'K'), (21, 'L'), (22, 'M'), (23, 'N'), (24, 'O')
+    , (25, 'P'), (26, 'Q'), (27, 'R'), (28, 'S'), (29, 'T')
+    , (30, 'U'), (31, 'V') ]
+
 -- {{{1 encodeArray
 encodeArray :: Array Word8 Char
-encodeArray = array (0, 32) [
-    (0, '0'), (1, '1'), (2, '2'), (3, '3'), (4, '4'),
-    (5, '5'), (6, '6'), (7, '7'), (8, '8'), (9, '9'),
-    (10, 'A'), (11, 'B'), (12, 'C'), (13, 'D'), (14, 'E'),
-    (15, 'F'), (16, 'G'), (17, 'H'), (18, 'I'), (19, 'J'),
-    (20, 'K'), (21, 'L'), (22, 'M'), (23, 'N'), (24, 'O'),
-    (25, 'P'), (26, 'Q'), (27, 'R'), (28, 'S'), (29, 'T'),
-    (30, 'U'), (31, 'V') ]
+encodeArray = array (0, 32) _encMap
 
 -- {{{1 decodeMap
 decodeMap :: M.Map Char Word8
-decodeMap = M.fromList [
-    ('0', 0), ('1', 1), ('2', 2), ('3', 3), ('4', 4),
-    ('5', 5), ('6', 6), ('7', 7), ('8', 8), ('9', 9),
-    ('A', 10), ('B', 11), ('C', 12), ('D', 13), ('E', 14),
-    ('F', 15), ('G', 16), ('H', 17), ('I', 18), ('J', 19),
-    ('K', 20), ('L', 21), ('M', 22), ('N', 23), ('O', 24),
-    ('P', 25), ('Q', 26), ('R', 27), ('S', 28), ('T', 29),
-    ('U', 30), ('V', 31)
-    ]
+decodeMap = M.fromList [(snd i, fst i) | i <- _encMap]
 
 -- {{{1 encode
 -- | Encode data.
 encode :: [Word8]
     -> String
-encode [] = ""
-encode [o] = let
-        i1 = o `shiftR` 3
-        i2 = o `shiftL` 2 .&. 0x1f
-    in (encodeArray ! i1) : (encodeArray ! i2) : "======"
-encode [o1, o2] = let
-        i1 = o1 `shiftR` 3
-        i2 = (o1 `shiftL` 2 .|. o2 `shiftR` 6) .&. 0x1f
-        i3 = o2 `shiftR` 1 .&. 0x1f
-        i4 = o2 `shiftL` 4 .&. 0x1f
-    in foldr (\ i s -> (encodeArray ! i) : s) "====" [i1, i2, i3, i4]
-encode [o1, o2, o3] = let
-        i1 = o1 `shiftR` 3
-        i2 = (o1 `shiftL` 2 .|. o2 `shiftR` 6) .&. 0x1f
-        i3 = o2 `shiftR` 1 .&. 0x1f
-        i4 = (o2 `shiftL` 4 .|. o3 `shiftR` 4) .&. 0x1f
-        i5 = o3 `shiftL` 1 .&. 0x1f
-    in foldr (\ i s -> (encodeArray ! i) : s) "===" [i1, i2, i3, i4, i5]
-encode [o1, o2, o3, o4] = let
-        i1 = o1 `shiftR` 3
-        i2 = (o1 `shiftL` 2 .|. o2 `shiftR` 6) .&. 0x1f
-        i3 = o2 `shiftR` 1 .&. 0x1f
-        i4 = (o2 `shiftL` 4 .|. o3 `shiftR` 4) .&. 0x1f
-        i5 = (o3 `shiftL` 1 .|. o4 `shiftR` 7) .&. 0x1f
-        i6 = o4 `shiftR` 2 .&. 0x1f
-        i7 = o4 `shiftL` 3 .&. 0x1f
-    in foldr (\ i s -> (encodeArray ! i) : s) "=" [i1, i2, i3, i4, i5, i6, i7]
-encode (o1:o2:o3:o4:o5:os) = let
-        i1 = o1 `shiftR` 3
-        i2 = (o1 `shiftL` 2 .|. o2 `shiftR` 6) .&. 0x1f
-        i3 = o2 `shiftR` 1 .&. 0x1f
-        i4 = (o2 `shiftL` 4 .|. o3 `shiftR` 4) .&. 0x1f
-        i5 = (o3 `shiftL` 1 .|. o4 `shiftR` 7) .&. 0x1f
-        i6 = o4 `shiftR` 2 .&. 0x1f
-        i7 = (o4 `shiftL` 3 .|. o5 `shiftR` 5) .&. 0x1f
-        i8 = o5 .&. 0x1f
-    in (foldr (\ i s -> (encodeArray ! i) : s) "" [i1, i2, i3, i4, i5, i6, i7, i8]) ++ (encode os)
+encode = let
+        pad n = take n $ repeat 0
+        enc [] = ""
+        enc l@[o] = (++ "======") . take 2 . enc $ l ++ pad 4
+        enc l@[o1, o2] = (++ "====") . take 4 . enc $ l ++ pad 3
+        enc l@[o1, o2, o3] = (++ "===") . take 5 . enc $ l ++ pad 2
+        enc l@[o1, o2, o3, o4] = (++ "=") . take 7 . enc $ l ++ pad 1
+        enc (o1:o2:o3:o4:o5:os) = let
+                i1 = o1 `shiftR` 3
+                i2 = (o1 `shiftL` 2 .|. o2 `shiftR` 6) .&. 0x1f
+                i3 = o2 `shiftR` 1 .&. 0x1f
+                i4 = (o2 `shiftL` 4 .|. o3 `shiftR` 4) .&. 0x1f
+                i5 = (o3 `shiftL` 1 .|. o4 `shiftR` 7) .&. 0x1f
+                i6 = o4 `shiftR` 2 .&. 0x1f
+                i7 = (o4 `shiftL` 3 .|. o5 `shiftR` 5) .&. 0x1f
+                i8 = o5 .&. 0x1f
+            in (foldr (\ i s -> (encodeArray ! i) : s) "" [i1, i2, i3, i4, i5, i6, i7, i8]) ++ (enc os)
+    in enc
 
 -- {{{1 decode
 -- | Decode data (lazy).
 decode' :: String
     -> [Maybe Word8]
 decode' = let
+        pad n = take n . repeat $ Just 0
         dec [] = []
-        dec [Just eo1, Just eo2] = [Just (eo1 `shiftL` 3 .|. eo2 `shiftR` 2)]
-        dec [Just eo1, Just eo2, Just eo3, Just eo4] = let
-                o1 = eo1 `shiftL` 3 .|. eo2 `shiftR` 2
-                o2 = eo2 `shiftL` 6 .|. eo3 `shiftL` 1 .|. eo4 `shiftR` 4
-            in [Just o1, Just o2]
-        dec [Just eo1, Just eo2, Just eo3, Just eo4, Just eo5] = let
-                o1 = eo1 `shiftL` 3 .|. eo2 `shiftR` 2
-                o2 = eo2 `shiftL` 6 .|. eo3 `shiftL` 1 .|. eo4 `shiftR` 4
-                o3 = eo4 `shiftL` 4 .|. eo5 `shiftR` 1
-            in [Just o1, Just o2, Just o3]
-        dec [Just eo1, Just eo2, Just eo3, Just eo4, Just eo5, Just eo6, Just eo7] = let
-                o1 = eo1 `shiftL` 3 .|. eo2 `shiftR` 2
-                o2 = eo2 `shiftL` 6 .|. eo3 `shiftL` 1 .|. eo4 `shiftR` 4
-                o3 = eo4 `shiftL` 4 .|. eo5 `shiftR` 1
-                o4 = eo5 `shiftL` 7 .|. eo6 `shiftL` 2 .|. eo7 `shiftR` 3
-            in [Just o1, Just o2, Just o3, Just o4]
+        dec l@[Just eo1, Just eo2] = take 1 . dec $ l ++ pad 6
+        dec l@[Just eo1, Just eo2, Just eo3, Just eo4] = take 2 . dec $ l ++ pad 4
+        dec l@[Just eo1, Just eo2, Just eo3, Just eo4, Just eo5] = take 3 . dec $ l ++ pad 3
+        dec l@[Just eo1, Just eo2, Just eo3, Just eo4, Just eo5, Just eo6, Just eo7] = take 4 . dec $ l ++ pad 1
         dec (Just eo1:Just eo2:Just eo3:Just eo4:Just eo5:Just eo6:Just eo7:Just eo8:eos) = let
                 o1 = eo1 `shiftL` 3 .|. eo2 `shiftR` 2
                 o2 = eo2 `shiftL` 6 .|. eo3 `shiftL` 1 .|. eo4 `shiftR` 4
diff --git a/src/Codec/Binary/Base64.hs b/src/Codec/Binary/Base64.hs
--- a/src/Codec/Binary/Base64.hs
+++ b/src/Codec/Binary/Base64.hs
@@ -35,72 +35,56 @@
 import Data.Word
 import qualified Data.Map as M
 
+-- {{{1 enc/dec map
+_encMap =
+    [ (0, 'A'), (1, 'B'), (2, 'C'), (3, 'D'), (4, 'E')
+    , (5, 'F') , (6, 'G'), (7, 'H'), (8, 'I'), (9, 'J')
+    , (10, 'K'), (11, 'L'), (12, 'M'), (13, 'N'), (14, 'O')
+    , (15, 'P'), (16, 'Q'), (17, 'R'), (18, 'S'), (19, 'T')
+    , (20, 'U'), (21, 'V'), (22, 'W'), (23, 'X'), (24, 'Y')
+    , (25, 'Z'), (26, 'a'), (27, 'b'), (28, 'c'), (29, 'd')
+    , (30, 'e'), (31, 'f'), (32, 'g'), (33, 'h'), (34, 'i')
+    , (35, 'j'), (36, 'k'), (37, 'l'), (38, 'm'), (39, 'n')
+    , (40, 'o'), (41, 'p'), (42, 'q'), (43, 'r'), (44, 's')
+    , (45, 't'), (46, 'u'), (47, 'v'), (48, 'w'), (49, 'x')
+    , (50, 'y'), (51, 'z'), (52, '0'), (53, '1'), (54, '2')
+    , (55, '3'), (56, '4'), (57, '5'), (58, '6'), (59, '7')
+    , (60, '8'), (61, '9'), (62, '+'), (63, '/') ]
+
 -- {{{1 encodeArray
 encodeArray :: Array Word8 Char
-encodeArray = array (0, 64) [
-    (0, 'A'), (1, 'B'), (2, 'C'), (3, 'D'), (4, 'E'),
-    (5, 'F') , (6, 'G'), (7, 'H'), (8, 'I'), (9, 'J'),
-    (10, 'K'), (11, 'L'), (12, 'M'), (13, 'N'), (14, 'O'),
-    (15, 'P'), (16, 'Q'), (17, 'R'), (18, 'S'), (19, 'T'),
-    (20, 'U'), (21, 'V'), (22, 'W'), (23, 'X'), (24, 'Y'),
-    (25, 'Z'), (26, 'a'), (27, 'b'), (28, 'c'), (29, 'd'),
-    (30, 'e'), (31, 'f'), (32, 'g'), (33, 'h'), (34, 'i'),
-    (35, 'j'), (36, 'k'), (37, 'l'), (38, 'm'), (39, 'n'),
-    (40, 'o'), (41, 'p'), (42, 'q'), (43, 'r'), (44, 's'),
-    (45, 't'), (46, 'u'), (47, 'v'), (48, 'w'), (49, 'x'),
-    (50, 'y'), (51, 'z'), (52, '0'), (53, '1'), (54, '2'),
-    (55, '3'), (56, '4'), (57, '5'), (58, '6'), (59, '7'),
-    (60, '8'), (61, '9'), (62, '+'), (63, '/') ]
+encodeArray = array (0, 64) _encMap
 
 -- {{{1 decodeMap
 decodeMap :: M.Map Char Word8
-decodeMap  = M.fromList [
-    ('A', 0), ('B', 1), ('C', 2), ('D', 3), ('E', 4),
-    ('F', 5), ('G', 6), ('H', 7), ('I', 8), ('J', 9),
-    ('K', 10), ('L', 11), ('M', 12), ('N', 13), ('O', 14),
-    ('P', 15), ('Q', 16), ('R', 17), ('S', 18), ('T', 19),
-    ('U', 20), ('V', 21), ('W', 22), ('X', 23), ('Y', 24),
-    ('Z', 25), ('a', 26), ('b', 27), ('c', 28), ('d', 29),
-    ('e', 30), ('f', 31), ('g', 32), ('h', 33), ('i', 34),
-    ('j', 35), ('k', 36), ('l', 37), ('m', 38), ('n', 39),
-    ('o', 40), ('p', 41), ('q', 42), ('r', 43), ('s', 44),
-    ('t', 45), ('u', 46), ('v', 47), ('w', 48), ('x', 49),
-    ('y', 50), ('z', 51), ('0', 52), ('1', 53), ('2', 54),
-    ('3', 55), ('4', 56), ('5', 57), ('6', 58), ('7', 59),
-    ('8', 60), ('9', 61), ('+', 62), ('/', 63) ]
+decodeMap  = M.fromList [(snd i, fst i) | i <- _encMap]
 
 -- {{{1 encode
 -- | Encode data.
 encode :: [Word8]
     -> String
-encode [] = ""
-encode [o] = let
-        i1 = o `shiftR` 2
-        i2 = o `shiftL` 4 .&. 0x3f
-    in (encodeArray ! i1) : (encodeArray ! i2) : "=="
-encode [o1, o2] = let
-        i1 = o1 `shiftR` 2
-        i2 = (o1 `shiftL` 4 .|. o2 `shiftR` 4) .&. 0x3f
-        i3 = o2 `shiftL` 2 .&. 0x3f
-    in foldr (\ i s-> (encodeArray ! i) : s) "=" [i1, i2, i3]
-encode (o1:o2:o3:os) = let
-        i1 = o1 `shiftR` 2
-        i2 = (o1 `shiftL` 4 .|. o2 `shiftR` 4) .&. 0x3f
-        i3 = (o2 `shiftL` 2 .|. o3 `shiftR` 6) .&. 0x3f
-        i4 = o3 .&. 0x3f
-    in (foldr (\ i s -> (encodeArray ! i) : s) "" [i1, i2, i3, i4]) ++ encode os
+encode = let
+        pad n = take n $ repeat 0
+        enc [] = ""
+        enc l@[o] = (++ "==") . take 2 .enc $ l ++ pad 2
+        enc l@[o1, o2] = (++ "=") . take 3 . enc $ l ++ pad 1
+        enc (o1:o2:o3:os) = let
+                i1 = o1 `shiftR` 2
+                i2 = (o1 `shiftL` 4 .|. o2 `shiftR` 4) .&. 0x3f
+                i3 = (o2 `shiftL` 2 .|. o3 `shiftR` 6) .&. 0x3f
+                i4 = o3 .&. 0x3f
+            in (foldr (\ i s -> (encodeArray ! i) : s) "" [i1, i2, i3, i4]) ++ enc os
+    in enc
 
 -- {{{1 decode
 -- | Decode data (lazy).
 decode' :: String
     -> [Maybe Word8]
 decode' = let
+        pad n = take n $ repeat $ Just 0
         dec [] = []
-        dec [Just eo1, Just eo2] = [Just (eo1 `shiftL` 2 .|. eo2 `shiftR` 4)]
-        dec [Just eo1, Just eo2, Just eo3] = let
-                o1 = eo1 `shiftL` 2 .|. eo2 `shiftR` 4
-                o2 = eo2 `shiftL` 4 .|. eo3 `shiftR` 2
-            in [Just o1, Just o2]
+        dec l@[Just eo1, Just eo2] = take 1 . dec $ l ++ pad 2
+        dec l@[Just eo1, Just eo2, Just eo3] = take 2 . dec $ l ++ pad 1
         dec (Just eo1:Just eo2:Just eo3:Just eo4:eos) = let
                 o1 = eo1 `shiftL` 2 .|. eo2 `shiftR` 4
                 o2 = eo2 `shiftL` 4 .|. eo3 `shiftR` 2
diff --git a/src/Codec/Binary/Base85.hs b/src/Codec/Binary/Base85.hs
new file mode 100644
--- /dev/null
+++ b/src/Codec/Binary/Base85.hs
@@ -0,0 +1,117 @@
+{- Copyright © 2008 Magnus Therning
+ -
+ - This file is part of dataenc.
+ -
+ - Dataenc is free software: you can redistribute it and/or modify it under
+ - the terms of the GNU Lesser General Public License as published by the
+ - Free Software Foundation, either version 3 of the License, or (at your
+ - option) any later version.
+ -
+ - Dataenc is distributed in the hope that it will be useful, but WITHOUT
+ - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ - FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ - License for more details.
+ -
+ - You should have received a copy of the GNU Lesser General Public License
+ - along with dataenc.  If not, see <http://www.gnu.org/licenses/>
+ -}
+
+-- | Base85 module.
+--
+--   Implemented as described at <http://en.wikipedia.org/wiki/Ascii85>.
+module Codec.Binary.Base85
+    ( encode
+    , decode
+    , decode'
+    , chop
+    , unchop
+    ) where
+
+import Data.Array
+import Data.Bits
+import Data.Char
+import Data.Maybe
+import Data.Word
+import qualified Data.Map as M
+
+-- {{{1 enc/dec map
+_encMap :: [(Word8, Char)]
+_encMap = [(fromIntegral i, chr i) | i <- [33..117]]
+
+-- {{{1 encodeArray
+encodeArray :: Array Word8 Char
+encodeArray = array (33, 117) _encMap
+
+-- {{{1 decodeMap
+decodeMap :: M.Map Char Word8
+decodeMap = M.fromList [(snd i, fst i) | i <- _encMap]
+
+-- {{{1 encode
+-- | Encode data.
+--
+--   The result will not be enclosed in \<~ ~\>.
+encode :: [Word8]
+    -> String
+encode [] = ""
+encode [b1] = take 2 $ encode [b1, 0, 0, 1]
+encode [b1, b2] = take 3 $ encode [b1, b2, 0, 1]
+encode [b1, b2, b3] = take 4 $ encode [b1, b2, b3, 1]
+encode (0:0:0:0:bs) = "z" ++ encode bs
+encode (b1:b2:b3:b4:bs) = (foldr (\ i s -> (encodeArray ! i) : s) "" group) ++ (encode bs)
+    where
+        group2Int :: Int
+        group2Int = foldl (\ a b -> a `shiftL` 8 + (fromIntegral b)) 0 [b1, b2, b3, b4]
+        encodeInt2Ints :: Int -> [Word8]
+        encodeInt2Ints = map fromIntegral . map (`mod` 85) . take 5 . iterate (`div` 85)
+        adjustNReverse = reverse . map (+ 33)
+        group = (adjustNReverse .encodeInt2Ints) group2Int
+
+-- {{{1 decode
+-- | Decode data (lazy).
+--
+--   The input must not be enclosed in \<~ ~\>.
+decode' :: String
+    -> [Maybe Word8]
+decode' [] = []
+decode' ('z':cs) = (Just 0:Just 0:Just 0:Just 0:decode' cs)
+decode' cs = let
+        pad n = take n $ repeat $ Just 0
+        dec :: [Maybe Word8] -> [Maybe Word8]
+        dec l@[Just c1, Just c2] = take 1 . dec $ l ++ pad 3
+        dec l@[Just c1, Just c2, Just c3] = take 2 . dec $ l ++ pad 2
+        dec l@[Just c1, Just c2, Just c3, Just c4] = take 3 . dec $ l ++ pad 1
+        dec l@[Just c1, Just c2, Just c3, Just c4, Just c5] = let
+                adjRev = map (flip (-) 33) [c5, c4, c3, c2, c1]
+                group2Int :: [Word8] -> Int
+                group2Int = foldl1 (+) . map (uncurry (*)) . zip (map (85 ^) [0..4]) . map fromIntegral
+                int2Group :: Int -> [Maybe Word8]
+                int2Group = map Just . map fromIntegral . reverse . take 4 . iterate (`div` 256)
+            in (int2Group . group2Int) adjRev
+        dec _ = [Nothing]
+    in (dec . map (flip M.lookup decodeMap) $ take 5 cs) ++ decode' (drop 5 cs)
+
+-- | Decode data (strict).
+--
+--   The input must not be enclosed in \<~ ~\>.
+decode :: String
+    -> Maybe [Word8]
+decode = sequence . decode'
+
+-- {{{1 chop
+-- | Chop up a string in parts.
+--
+--   The length given is rounded down to the nearest multiple of 5.
+chop :: Int     -- ^ length of individual lines
+    -> String
+    -> [String]
+chop _ "" = []
+chop n s = let
+        enc_len | n < 5 = 5
+                | otherwise = n `div` 5 * 5
+    in (take enc_len s) : chop n (drop enc_len s)
+
+-- {{{1 unchop
+-- | Concatenate the strings into one long string.
+unchop :: [String]
+    -> String
+unchop = foldr (++) ""
diff --git a/src/Codec/Binary/DataEncoding.hs b/src/Codec/Binary/DataEncoding.hs
--- a/src/Codec/Binary/DataEncoding.hs
+++ b/src/Codec/Binary/DataEncoding.hs
@@ -34,6 +34,7 @@
     , base32Hex
     , base64
     , base64Url
+    , base85
     , uu
     )
     where
@@ -45,6 +46,7 @@
 import qualified Codec.Binary.Base32Hex as Base32Hex
 import qualified Codec.Binary.Base64 as Base64
 import qualified Codec.Binary.Base64Url as Base64Url
+import qualified Codec.Binary.Base85 as Base85
 import qualified Codec.Binary.Uu as Uu
 
 -- {{{1 DataCodec
@@ -115,6 +117,18 @@
     decode'=Base64Url.decode',
     chop=Base64Url.chop,
     unchop=Base64Url.unchop
+}
+
+-- {{{1 base85
+-- | Base85 encoding, see "Codec.Binary.Base85" for more details
+--   on the individual functions.
+base85 :: DataCodec
+base85 = DataCodec {
+    encode=Base85.encode,
+    decode=Base85.decode,
+    decode'=Base85.decode',
+    chop=Base85.chop,
+    unchop=Base85.unchop
 }
 
 -- {{{1 uu
diff --git a/src/Codec/Binary/Uu.hs b/src/Codec/Binary/Uu.hs
--- a/src/Codec/Binary/Uu.hs
+++ b/src/Codec/Binary/Uu.hs
@@ -36,72 +36,56 @@
 import Data.Word
 import qualified Data.Map as M
 
+-- {{{1 enc/dec map
+_encMap =
+    [ (0, '`'), (1, '!'), (2, '"'), (3, '#'), (4, '$')
+    , (5, '%'), (6, '&'), (7, '\''), (8, '('), (9, ')')
+    , (10, '*'), (11, '+'), (12, ','), (13, '-'), (14, '.')
+    , (15, '/'), (16, '0'), (17, '1'), (18, '2'), (19, '3')
+    , (20, '4'), (21, '5'), (22, '6'), (23, '7'), (24, '8')
+    , (25, '9'), (26, ':'), (27, ';'), (28, '<'), (29, '=')
+    , (30, '>'), (31, '?'), (32, '@'), (33, 'A'), (34, 'B')
+    , (35, 'C'), (36, 'D'), (37, 'E'), (38, 'F'), (39, 'G')
+    , (40, 'H'), (41, 'I'), (42, 'J'), (43, 'K'), (44, 'L')
+    , (45, 'M'), (46, 'N'), (47, 'O'), (48, 'P'), (49, 'Q')
+    , (50, 'R'), (51, 'S'), (52, 'T'), (53, 'U') ,(54, 'V')
+    , (55, 'W'), (56, 'X'), (57, 'Y'), (58, 'Z'), (59, '[')
+    , (60, '\\'), (61, ']'), (62, '^'), (63, '_') ]
+
 -- {{{1 encodeArray
 encodeArray :: Array Word8 Char
-encodeArray = array (0, 64) [
-    (0, '`'), (1, '!'), (2, '"'), (3, '#'), (4, '$'),
-    (5, '%'), (6, '&'), (7, '\''), (8, '('), (9, ')'),
-    (10, '*'), (11, '+'), (12, ','), (13, '-'), (14, '.'),
-    (15, '/'), (16, '0'), (17, '1'), (18, '2'), (19, '3'),
-    (20, '4'), (21, '5'), (22, '6'), (23, '7'), (24, '8'),
-    (25, '9'), (26, ':'), (27, ';'), (28, '<'), (29, '='),
-    (30, '>'), (31, '?'), (32, '@'), (33, 'A'), (34, 'B'),
-    (35, 'C'), (36, 'D'), (37, 'E'), (38, 'F'), (39, 'G'),
-    (40, 'H'), (41, 'I'), (42, 'J'), (43, 'K'), (44, 'L'),
-    (45, 'M'), (46, 'N'), (47, 'O'), (48, 'P'), (49, 'Q'),
-    (50, 'R'), (51, 'S'), (52, 'T'), (53, 'U') ,(54, 'V'),
-    (55, 'W'), (56, 'X'), (57, 'Y'), (58, 'Z'), (59, '['),
-    (60, '\\'), (61, ']'), (62, '^'), (63, '_') ]
+encodeArray = array (0, 64) _encMap
 
 -- {{{1 decodeMap
 decodeMap :: M.Map Char Word8
-decodeMap = M.fromList [
-    ('`', 0), ('!', 1), ('"', 2), ('#', 3), ('$', 4),
-    ('%', 5), ('&', 6), ('\'', 7), ('(', 8), (')', 9),
-    ('*', 10), ('+', 11), (',', 12), ('-', 13), ('.', 14),
-    ('/', 15), ('0', 16), ('1', 17), ('2', 18), ('3', 19),
-    ('4', 20), ('5', 21), ('6', 22), ('7', 23), ('8', 24),
-    ('9', 25), (':', 26), (';', 27), ('<', 28), ('=', 29),
-    ('>', 30), ('?', 31), ('@', 32), ('A', 33), ('B', 34),
-    ('C', 35), ('D', 36), ('E', 37), ('F', 38), ('G', 39),
-    ('H', 40), ('I', 41), ('J', 42), ('K', 43), ('L', 44),
-    ('M', 45), ('N', 46), ('O', 47), ('P', 48), ('Q', 49),
-    ('R', 50), ('S', 51), ('T', 52), ('U', 53), ('V', 54),
-    ('W', 55), ('X', 56), ('Y', 57), ('Z', 58), ('[', 59),
-    ('\\', 60), (']', 61), ('^', 62), ('_', 63) ]
+decodeMap = M.fromList [(snd i, fst i) | i <- _encMap]
 
 -- {{{1 encode
 -- | Encode data.
 encode :: [Word8]
     -> String
-encode [] = ""
-encode [o] = let
-        i1 = o `shiftR` 2
-        i2 = o `shiftL` 4 .&. 0x3f
-    in (encodeArray ! i1) : (encodeArray ! i2) : ""
-encode [o1, o2] = let
-        i1 = o1 `shiftR` 2
-        i2 = (o1 `shiftL` 4 .|. o2 `shiftR` 4) .&. 0x3f
-        i3 = o2 `shiftL` 2 .&. 0x3f
-    in foldr (\ i s-> (encodeArray ! i) : s) "" [i1, i2, i3]
-encode (o1:o2:o3:os) = let
-        i1 = o1 `shiftR` 2
-        i2 = (o1 `shiftL` 4 .|. o2 `shiftR` 4) .&. 0x3f
-        i3 = (o2 `shiftL` 2 .|. o3 `shiftR` 6) .&. 0x3f
-        i4 = o3 .&. 0x3f
-    in (foldr (\ i s -> (encodeArray ! i) : s) "" [i1, i2, i3, i4]) ++ encode os
+encode = let
+        pad n = take n $ repeat 0
+        enc [] = ""
+        enc l@[o] = take 2 . enc $ l ++ pad 2
+        enc l@[o1, o2] = take 3 . enc $ l ++ pad 1
+        enc (o1:o2:o3:os) = let
+                i1 = o1 `shiftR` 2
+                i2 = (o1 `shiftL` 4 .|. o2 `shiftR` 4) .&. 0x3f
+                i3 = (o2 `shiftL` 2 .|. o3 `shiftR` 6) .&. 0x3f
+                i4 = o3 .&. 0x3f
+            in (foldr (\ i s -> (encodeArray ! i) : s) "" [i1, i2, i3, i4]) ++ enc os
+    in enc
 
 -- {{{1 decode
 -- | Decode data (lazy).
 decode' :: String
     -> [Maybe Word8]
 decode' = let
+        pad n = take n . repeat $ Just 0
         dec [] = []
-        dec [Just eo1, Just eo2] = [Just (eo1 `shiftL` 2 .|. eo2 `shiftR` 4)]
-        dec [Just eo1, Just eo2, Just eo3] = let
-                o1 = eo1 `shiftL` 2 .|. eo2 `shiftR` 4
-                o2 = eo2 `shiftL` 4 .|. eo3 `shiftR` 2
-            in [Just o1, Just o2]
+        dec l@[Just eo1, Just eo2] = take 1 . dec $ l ++ pad 2
+        dec l@[Just eo1, Just eo2, Just eo3] = take 2 . dec $ l ++ pad 1
         dec (Just eo1:Just eo2:Just eo3:Just eo4:eos) = let
                 o1 = eo1 `shiftL` 2 .|. eo2 `shiftR` 4
                 o2 = eo2 `shiftL` 4 .|. eo3 `shiftR` 2