diff --git a/changes/integers_donna b/changes/integers_donna
new file mode 100644
index 000000000..e9c69e8e1
--- /dev/null
+++ b/changes/integers_donna
@@ -0,0 +1,3 @@
+  o Minor bugfixes (portability)
+    - Tweak the curve25519-donna*.c implementations to tolerate systems
+      that lack stdint.h. Fixes bug 3894; bugfix on 0.2.4.8-alpha.
diff --git a/src/ext/curve25519_donna/curve25519-donna-c64.c b/src/ext/curve25519_donna/curve25519-donna-c64.c
index 9ebd8a12d..b68ff3695 100644
--- a/src/ext/curve25519_donna/curve25519-donna-c64.c
+++ b/src/ext/curve25519_donna/curve25519-donna-c64.c
@@ -22,8 +22,10 @@
  * from the sample implementation.
  */
 
+#include "orconfig.h"
+
 #include <string.h>
-#include <stdint.h>
+#include "torint.h"
 
 typedef uint8_t u8;
 typedef uint64_t limb;
diff --git a/src/ext/curve25519_donna/curve25519-donna.c b/src/ext/curve25519_donna/curve25519-donna.c
index 80e4594ee..5c6821ccd 100644
--- a/src/ext/curve25519_donna/curve25519-donna.c
+++ b/src/ext/curve25519_donna/curve25519-donna.c
@@ -46,8 +46,10 @@
  * from the sample implementation.
  */
 
+#include "orconfig.h"
+
 #include <string.h>
-#include <stdint.h>
+#include "torint.h"
 
 typedef uint8_t u8;
 typedef int32_t s32;