diff --git a/src/java/com/threerings/util/keybd/i686-Linux/Makefile b/src/java/com/threerings/util/keybd/Linux/Makefile
similarity index 93%
rename from src/java/com/threerings/util/keybd/i686-Linux/Makefile
rename to src/java/com/threerings/util/keybd/Linux/Makefile
index e046260ce..a88b25992 100644
--- a/src/java/com/threerings/util/keybd/i686-Linux/Makefile
+++ b/src/java/com/threerings/util/keybd/Linux/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.7 2004/10/20 03:30:46 mdb Exp $
+# $Id$
 
 #
 # Executable definitions
diff --git a/src/java/com/threerings/util/keybd/i686-Linux/com_threerings_util_keybd_Keyboard.c b/src/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c
similarity index 96%
rename from src/java/com/threerings/util/keybd/i686-Linux/com_threerings_util_keybd_Keyboard.c
rename to src/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c
index 3d4bdb285..38cd43493 100644
--- a/src/java/com/threerings/util/keybd/i686-Linux/com_threerings_util_keybd_Keyboard.c
+++ b/src/java/com/threerings/util/keybd/Linux/com_threerings_util_keybd_Keyboard.c
@@ -1,5 +1,5 @@
 /*
- * $Id: com_threerings_util_keybd_Keyboard.c,v 1.2 2003/01/23 19:00:44 mdb Exp $
+ * $Id$
  */
 
 #include <stdio.h>
diff --git a/src/java/com/threerings/util/keybd/i686-Linux/libkeybd.so b/src/java/com/threerings/util/keybd/Linux/libkeybd.so
similarity index 100%
rename from src/java/com/threerings/util/keybd/i686-Linux/libkeybd.so
rename to src/java/com/threerings/util/keybd/Linux/libkeybd.so
diff --git a/src/java/com/threerings/util/keybd/i686-Windows/.cvsignore b/src/java/com/threerings/util/keybd/Windows/.cvsignore
similarity index 100%
rename from src/java/com/threerings/util/keybd/i686-Windows/.cvsignore
rename to src/java/com/threerings/util/keybd/Windows/.cvsignore
diff --git a/src/java/com/threerings/util/keybd/i686-Windows/Makefile b/src/java/com/threerings/util/keybd/Windows/Makefile
similarity index 92%
rename from src/java/com/threerings/util/keybd/i686-Windows/Makefile
rename to src/java/com/threerings/util/keybd/Windows/Makefile
index 7fbee5934..dcb7a0e91 100644
--- a/src/java/com/threerings/util/keybd/i686-Windows/Makefile
+++ b/src/java/com/threerings/util/keybd/Windows/Makefile
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile,v 1.1 2003/01/12 00:26:39 shaper Exp $
+# $Id$
 
 CROSSTOOLS_PATH=/usr/local/cross-tools
 MINGW_PATH=${CROSSTOOLS_PATH}/i386-mingw32msvc
diff --git a/src/java/com/threerings/util/keybd/i686-Windows/com_threerings_util_keybd_Keyboard.c b/src/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c
similarity index 97%
rename from src/java/com/threerings/util/keybd/i686-Windows/com_threerings_util_keybd_Keyboard.c
rename to src/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c
index 8a0e529db..aeb521c02 100644
--- a/src/java/com/threerings/util/keybd/i686-Windows/com_threerings_util_keybd_Keyboard.c
+++ b/src/java/com/threerings/util/keybd/Windows/com_threerings_util_keybd_Keyboard.c
@@ -1,5 +1,5 @@
 /*
- * $Id: com_threerings_util_keybd_Keyboard.c,v 1.1 2003/01/12 00:26:39 shaper Exp $
+ * $Id$
  */
 
 #include <stdio.h>