diff --git a/ChangeLog b/ChangeLog
index 36a0ba74e8159ff57be5e507afb1495187732645..725d22de743640a88ccaf574481f61911c1ec033 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2016-08-16  Niels Möller  <nisse@lysator.liu.se>
 
+	* rsa2openpgp.c (rsa_keypair_to_openpgp): Added cast to const
+	uint8_t *.
+
 	* pgp-encode.c (write_string): New helper function, replacing...
 	(WRITE): ... deleted macro.
 
diff --git a/rsa2openpgp.c b/rsa2openpgp.c
index d04f77a5c0955b5d1fb9127da178ad3184637a35..c72a857baadcb63998646c673748088cfc827dec 100644
--- a/rsa2openpgp.c
+++ b/rsa2openpgp.c
@@ -85,7 +85,7 @@ rsa_keypair_to_openpgp(struct nettle_buffer *buffer,
 
   /* userid packet */
   userid_start = buffer->size;
-  if (!pgp_put_userid(buffer, strlen(userid), userid))
+  if (!pgp_put_userid(buffer, strlen(userid), (const uint8_t *) userid))
     return 0;
 
   /* FIXME: We hash the key first, and then the user id. Is this right? */