diff --git a/ipalib/x509.py b/ipalib/x509.py
index 2d28876de..2edd3fef2 100644
--- a/ipalib/x509.py
+++ b/ipalib/x509.py
@@ -272,6 +272,8 @@ def make_pem(data):
     Convert a raw base64-encoded blob into something that looks like a PE
     file with lines split to 64 characters and proper headers.
     """
+    if isinstance(data, bytes):
+        data = data.decode('ascii')
     pemcert = '\r\n'.join([data[x:x+64] for x in range(0, len(data), 64)])
     return '-----BEGIN CERTIFICATE-----\n' + \
     pemcert + \