diff --git a/ChangeLog b/ChangeLog
index 34f36305d442d3d038538c313ba5a29fc4dbd5b3..25a017a765859e066fb8322d40ff7d0e380bb894 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-01-16  Niels Möller  <nisse@lysator.liu.se>
 
+	* poly1305-internal.c (s2, s3, s4): Fixed macros.
+
 	* poly1305-aes.h (struct poly1305_aes_ctx): Replace struct aes_ctx
 	by struct aes128_ctx.
 	* poly1305-aes.c (poly1305_aes_set_key, poly1305_aes_digest):
diff --git a/poly1305-internal.c b/poly1305-internal.c
index 7b1b541fdd8ddf71992fe6b937a807a23c9f25e5..e53a210d48b861c19d914fd1c44c5e972de0e8e9 100644
--- a/poly1305-internal.c
+++ b/poly1305-internal.c
@@ -44,9 +44,9 @@
 #define r3 r.r32[3]
 #define r4 r.r32[4]
 #define s1 r.r32[5]
-#define s2 r.s32[0]
-#define s3 r.s32[1]
-#define s4 r.s32[2]
+#define s2 s32[0]
+#define s3 s32[1]
+#define s4 s32[2]
 
 #define h0 h.h32[0]
 #define h1 h.h32[1]