diff --git a/ChangeLog b/ChangeLog
index e64889eff83668ca2d29c69b3d25ba81dc79dbfa..31e395dad1ab5c60b8116b5b21af9eb7031010f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-09-24  Niels Möller  <nisse@lysator.liu.se>
+
+	* curve25519.h [__cplusplus]: Fixed extern "C" block.
+
 2014-09-23  Niels Möller  <nisse@lysator.liu.se>
 
 	* ecc-hash.c (ecc_hash): Changed argument type from struct
diff --git a/curve25519.h b/curve25519.h
index a53ac2305c7f126f9038a58f214ca4a3c62d0d80..d9bcb0d5a4ac0527a13e0610fa9645e1652206bc 100644
--- a/curve25519.h
+++ b/curve25519.h
@@ -51,4 +51,8 @@ curve25519_mul_g (uint8_t *q, const uint8_t *n);
 int
 curve25519_mul (uint8_t *q, const uint8_t *n, const uint8_t *p);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* NETTLE_CURVE25519_H */