diff --git a/src/java/com/threerings/util/unsafe/i686-Linux/Makefile b/src/java/com/threerings/util/unsafe/Linux/Makefile
similarity index 93%
rename from src/java/com/threerings/util/unsafe/i686-Linux/Makefile
rename to src/java/com/threerings/util/unsafe/Linux/Makefile
index 335f1e306..7784242e9 100644
--- a/src/java/com/threerings/util/unsafe/i686-Linux/Makefile
+++ b/src/java/com/threerings/util/unsafe/Linux/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.3 2004/10/20 03:30:47 mdb Exp $
+# $Id$
 
 #
 # Executable definitions
diff --git a/src/java/com/threerings/util/unsafe/i686-Linux/com_threerings_util_unsafe_Unsafe.c b/src/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c
similarity index 95%
rename from src/java/com/threerings/util/unsafe/i686-Linux/com_threerings_util_unsafe_Unsafe.c
rename to src/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c
index 6af23cc17..a22893af5 100644
--- a/src/java/com/threerings/util/unsafe/i686-Linux/com_threerings_util_unsafe_Unsafe.c
+++ b/src/java/com/threerings/util/unsafe/Linux/com_threerings_util_unsafe_Unsafe.c
@@ -1,5 +1,5 @@
 /*
- * $Id: com_threerings_util_unsafe_Unsafe.c,v 1.2 2003/05/09 18:40:07 mdb Exp $
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/src/java/com/threerings/util/unsafe/i686-Linux/libunsafe.so b/src/java/com/threerings/util/unsafe/Linux/libunsafe.so
similarity index 100%
rename from src/java/com/threerings/util/unsafe/i686-Linux/libunsafe.so
rename to src/java/com/threerings/util/unsafe/Linux/libunsafe.so
diff --git a/src/java/com/threerings/util/unsafe/i686-Windows/.cvsignore b/src/java/com/threerings/util/unsafe/Windows/.cvsignore
similarity index 100%
rename from src/java/com/threerings/util/unsafe/i686-Windows/.cvsignore
rename to src/java/com/threerings/util/unsafe/Windows/.cvsignore
diff --git a/src/java/com/threerings/util/unsafe/i686-Windows/Makefile b/src/java/com/threerings/util/unsafe/Windows/Makefile
similarity index 93%
rename from src/java/com/threerings/util/unsafe/i686-Windows/Makefile
rename to src/java/com/threerings/util/unsafe/Windows/Makefile
index 930555794..9481edee6 100644
--- a/src/java/com/threerings/util/unsafe/i686-Windows/Makefile
+++ b/src/java/com/threerings/util/unsafe/Windows/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1 2003/05/09 03:22:16 mdb Exp $
+# $Id$
 
 NAME=unsafe
 
diff --git a/src/java/com/threerings/util/unsafe/i686-Windows/com_threerings_util_unsafe_Unsafe.c b/src/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c
similarity index 93%
rename from src/java/com/threerings/util/unsafe/i686-Windows/com_threerings_util_unsafe_Unsafe.c
rename to src/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c
index 6b3fbbe2d..a377db92b 100644
--- a/src/java/com/threerings/util/unsafe/i686-Windows/com_threerings_util_unsafe_Unsafe.c
+++ b/src/java/com/threerings/util/unsafe/Windows/com_threerings_util_unsafe_Unsafe.c
@@ -1,5 +1,5 @@
 /*
- * $Id: com_threerings_util_unsafe_Unsafe.c,v 1.1 2003/05/09 03:22:16 mdb Exp $
+ * $Id$
  */
 
 #include <stdio.h>