diff --git a/src/libsodium/Makefile.am b/src/libsodium/Makefile.am
index 5ce0a4fc..f70abe9d 100644
--- a/src/libsodium/Makefile.am
+++ b/src/libsodium/Makefile.am
@@ -126,8 +126,8 @@ libsodium_la_SOURCES = \
 	crypto_sign/ed25519/ref10/sign.c \
 	crypto_sign/ed25519/ref10/sqrtm1.h \
 	randombytes/randombytes.c \
-	randombytes/randombytes_salsa20_random.c \
-	randombytes/randombytes_sysrandom.c \
+	randombytes/salsa20/randombytes_salsa20_random.c \
+	randombytes/sys/randombytes_sysrandom.c \
 	utils.c \
 	version.c
 
diff --git a/src/libsodium/randombytes/randombytes_salsa20_random.c b/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
similarity index 100%
rename from src/libsodium/randombytes/randombytes_salsa20_random.c
rename to src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
diff --git a/src/libsodium/randombytes/randombytes_sysrandom.c b/src/libsodium/randombytes/sys/randombytes_sysrandom.c
similarity index 100%
rename from src/libsodium/randombytes/randombytes_sysrandom.c
rename to src/libsodium/randombytes/sys/randombytes_sysrandom.c