diff --git a/agent/cloudinit.c b/agent/cloudinit.c
index 5247a35..91149ac 100644
--- a/agent/cloudinit.c
+++ b/agent/cloudinit.c
@@ -77,7 +77,9 @@ cloudinit_fetch(struct system_config *sc)
 
 	/* pubkey */
 	if ((str = metadata(sc,
-	    "/latest/meta-data/public-keys/0/openssh-key", LINE)) == NULL)
+	    "/latest/meta-data/public-keys/0/openssh-key", LINE)) == NULL &&
+	    (str = metadata(sc,
+	    "/latest/meta-data/public-keys", LINE)) == NULL)
 		goto fail;
 	if (agent_addpubkey(sc, str, NULL) != 0)
 		goto fail;