diff --git a/ChangeLog b/ChangeLog
index ea920a4ad41e5e898595f02483054c10d1dabc09..b5918b6b178c61bdf529fc0c77d5dad0fe9c8a4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-04-17  Niels Möller  <nisse@lysator.liu.se>
 
+	* salsa20-crypt.c: Renamed file, from...
+	* salsa20.c: ... old name.
+
 	* x86_64/machine.m4 (WREG): New macro.
 
 	* salsa20.c (salsa20_hash): Deleted function, inlined into
diff --git a/Makefile.in b/Makefile.in
index 471c71ca86b4543eb5590150e55c143937e1eb75..71d92564551767c045a1a0c6996ca5ad3ef22b34 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,7 +81,7 @@ nettle_SOURCES = aes-decrypt-internal.c aes-decrypt.c \
 		 md2.c md2-meta.c md4.c md4-meta.c \
 		 md5.c md5-compress.c md5-compat.c md5-meta.c \
 		 ripemd160.c ripemd160-compress.c ripemd160-meta.c \
-		 salsa20.c salsa20-set-key.c \
+		 salsa20-crypt.c salsa20-set-key.c \
 		 sha1.c sha1-compress.c sha1-meta.c \
 		 sha256.c sha256-compress.c sha224-meta.c sha256-meta.c \
 		 sha512.c sha512-compress.c sha384-meta.c sha512-meta.c \
diff --git a/salsa20.c b/salsa20-crypt.c
similarity index 99%
rename from salsa20.c
rename to salsa20-crypt.c
index 6b4898b04bce4f895953a981c3425b403349ee05..55f6cfad6606e7e9d1dfcd18dcc87de45e7f7f0f 100644
--- a/salsa20.c
+++ b/salsa20-crypt.c
@@ -1,4 +1,4 @@
-/* salsa20.c
+/* salsa20-crypt.c
  *
  * The Salsa20 stream cipher.
  */