diff --git a/CHANGELOG b/CHANGELOG
index eba3fed..7812561 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@
  * CHANGELOG.
  */
 
-03082007 - Fixed a comment in physfs.h.
+03082007 - Fixed a comment in physfs.h. Renamed win32.c to windows.c.
 11052006 - More 7zip archiver work (thanks, Dennis!). Initial Unicode work.
            Minor BeOS realpath tweak.
 09272006 - Reworked 7zip archiver (thanks, Dennis!).
diff --git a/TODO b/TODO
index 88c5a4e..a471ab0 100644
--- a/TODO
+++ b/TODO
@@ -29,7 +29,6 @@ UNICODE:
 - ZIP: Uses UTF-8 internally, so it's good to go.
 
 Stuff:
-- Rename win32.c to windows.c ... it should work on Win64.
 - Other archivers: perhaps tar(.gz|.bz2), RPM, ARJ, etc. These are less
   important, since streaming archives aren't of much value to games (which
   is why zipfiles are king: random access), but it could have uses for, say,
diff --git a/physfs.dsp b/physfs.dsp
index 27007f8..965e004 100644
--- a/physfs.dsp
+++ b/physfs.dsp
@@ -169,7 +169,7 @@ SOURCE=.\archivers\wad.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\platform\win32.c
+SOURCE=.\platform\windows.c
 # End Source File
 # Begin Source File
 
diff --git a/physfs.vcproj b/physfs.vcproj
index 3403c46..b62b7ba 100644
--- a/physfs.vcproj
+++ b/physfs.vcproj
@@ -209,7 +209,7 @@
 				RelativePath=".\archivers\wad.c">
 			</File>
 			<File
-				RelativePath=".\platform\win32.c">
+				RelativePath=".\platform\windows.c">
 			</File>
 			<File
 				RelativePath=".\archivers\zip.c">
diff --git a/physfs_static.dsp b/physfs_static.dsp
index c22c0dc..83ca3c4 100644
--- a/physfs_static.dsp
+++ b/physfs_static.dsp
@@ -171,7 +171,7 @@ SOURCE=.\archivers\wad.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\platform\win32.c
+SOURCE=.\platform\windows.c
 # End Source File
 # Begin Source File
 
diff --git a/platform/Makefile.am b/platform/Makefile.am
index 0f039b5..61b67e4 100644
--- a/platform/Makefile.am
+++ b/platform/Makefile.am
@@ -9,7 +9,7 @@ libplatform_la_SOURCES =	\
 else
 libplatform_la_SOURCES =	\
 	unix.c                  \
-	win32.c                 \
+	windows.c                 \
 	posix.c                 \
 	os2.c
 endif
@@ -18,7 +18,7 @@ endif
 EXTRA_DIST =      \
 	skeleton.c    \
 	macclassic.c  \
-	win32.c       \
+	windows.c       \
 	pocketpc.c    \
 	unix.c        \
 	os2.c         \
diff --git a/platform/unix.c b/platform/unix.c
index 531500b..bc04450 100644
--- a/platform/unix.c
+++ b/platform/unix.c
@@ -10,7 +10,7 @@
 #  include <config.h>
 #endif
 
-/* BeOS uses beos.cpp and posix.c ... Cygwin and such use win32.c ... */
+/* BeOS uses beos.cpp and posix.c ... Cygwin and such use windows.c ... */
 #if ((!defined __BEOS__) && (!defined WIN32))
 
 #include <stdio.h>
diff --git a/platform/win32.c b/platform/windows.c
similarity index 99%
rename from platform/win32.c
rename to platform/windows.c
index dd98888..c94224d 100644
--- a/platform/win32.c
+++ b/platform/windows.c
@@ -1147,5 +1147,5 @@ void __PHYSFS_platformAllocatorFree(void *ptr)
 
 #endif
 
-/* end of win32.c ... */
+/* end of windows.c ... */