diff --git a/contrib/README.txt b/contrib/README.txt
index c6a4c762c8..b01448205e 100644
--- a/contrib/README.txt
+++ b/contrib/README.txt
@@ -17,7 +17,6 @@ Available libraries:
 - cocoa-callbacks -- Allows you to use Factor quotations as actions (Slava Pestov)
 - concurrency -- Erlang/Termite-style distibuted concurrency (Chris Double)
 - coroutines -- coroutines (Chris Double)
-- cpuinfo -- Information about your system (Doug Coleman)
 - crypto -- Various cryptographic algorithms (Doug Coleman)
 - dlists -- double-linked-lists (Mackenzie Straight)
 - emacs -- emacs integration (Eduardo Cavazos)
@@ -25,6 +24,7 @@ Available libraries:
 - furnace -- Web framework (Slava Pestov)
 - furnace-pastebin -- demo app for Furnace (Slava Pestov)
 - gap-buffer -- Efficient text editor buffer (Alex Chapman)
+- hardware-info -- Information about your computer (Doug Coleman)
 - hexdump -- Hexdump routine (Doug Coleman)
 - http -- Code shared by HTTP server and client (Slava Pestov)
 - httpd -- HTTP server (Slava Pestov, Chris Double)
diff --git a/contrib/all.factor b/contrib/all.factor
index 6e73bfee88..67fb941fec 100644
--- a/contrib/all.factor
+++ b/contrib/all.factor
@@ -2,10 +2,11 @@ USING: kernel modules words ;
 
 REQUIRES: contrib/alien contrib/automata contrib/base64
 contrib/benchmarks contrib/boids contrib/cairo contrib/calendar
-contrib/concurrency contrib/coroutines contrib/cpuinfo
-contrib/crypto contrib/dlists contrib/emacs contrib/furnace
-contrib/furnace-pastebin contrib/gap-buffer contrib/hexdump
-contrib/http contrib/httpd contrib/http-client contrib/jedit
+contrib/concurrency contrib/coroutines contrib/crypto
+contrib/dlists contrib/emacs contrib/furnace
+contrib/furnace-pastebin contrib/gap-buffer 
+contrib/hardware-info contrib/hexdump contrib/http
+contrib/httpd contrib/http-client contrib/jedit
 contrib/jni contrib/json contrib/lambda contrib/lazy-lists
 contrib/lindenmayer contrib/match contrib/math
 contrib/parser-combinators contrib/postgresql contrib/process
diff --git a/contrib/cpuinfo/cpuinfo.factor b/contrib/hardware-info/cpuinfo.factor
similarity index 100%
rename from contrib/cpuinfo/cpuinfo.factor
rename to contrib/hardware-info/cpuinfo.factor
diff --git a/contrib/cpuinfo/load.factor b/contrib/hardware-info/load.factor
similarity index 100%
rename from contrib/cpuinfo/load.factor
rename to contrib/hardware-info/load.factor
diff --git a/contrib/cpuinfo/os-unix.factor b/contrib/hardware-info/os-unix.factor
similarity index 100%
rename from contrib/cpuinfo/os-unix.factor
rename to contrib/hardware-info/os-unix.factor
diff --git a/contrib/cpuinfo/os-windows.factor b/contrib/hardware-info/os-windows.factor
similarity index 100%
rename from contrib/cpuinfo/os-windows.factor
rename to contrib/hardware-info/os-windows.factor