diff --git a/ruby/.footprint b/ruby/.footprint
index bb2a734b8..5c5fa8a4d 100644
--- a/ruby/.footprint
+++ b/ruby/.footprint
@@ -8,9 +8,9 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/testrb
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libruby-static.a
-lrwxrwxrwx	root/root	usr/lib/libruby.so -> libruby.so.1.8.5
-lrwxrwxrwx	root/root	usr/lib/libruby.so.1.8 -> libruby.so.1.8.5
--rwxr-xr-x	root/root	usr/lib/libruby.so.1.8.5
+lrwxrwxrwx	root/root	usr/lib/libruby.so -> libruby.so.1.8.6
+lrwxrwxrwx	root/root	usr/lib/libruby.so.1.8 -> libruby.so.1.8.6
+-rwxr-xr-x	root/root	usr/lib/libruby.so.1.8.6
 drwxr-xr-x	root/root	usr/lib/ruby/
 drwxr-xr-x	root/root	usr/lib/ruby/1.8/
 -rw-r--r--	root/root	usr/lib/ruby/1.8/English.rb
@@ -38,6 +38,9 @@ drwxr-xr-x	root/root	usr/lib/ruby/1.8/date/
 -rw-r--r--	root/root	usr/lib/ruby/1.8/date2.rb
 -rw-r--r--	root/root	usr/lib/ruby/1.8/debug.rb
 -rw-r--r--	root/root	usr/lib/ruby/1.8/delegate.rb
+-rw-r--r--	root/root	usr/lib/ruby/1.8/digest.rb
+drwxr-xr-x	root/root	usr/lib/ruby/1.8/digest/
+-rw-r--r--	root/root	usr/lib/ruby/1.8/digest/sha2.rb
 drwxr-xr-x	root/root	usr/lib/ruby/1.8/dl/
 -rw-r--r--	root/root	usr/lib/ruby/1.8/dl/import.rb
 -rw-r--r--	root/root	usr/lib/ruby/1.8/dl/struct.rb
@@ -124,8 +127,10 @@ drwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/
 -rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/curses.so
 -rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/dbm.so
 -rw-r--r--	root/root	usr/lib/ruby/1.8/linux/defines.h
+-rw-r--r--	root/root	usr/lib/ruby/1.8/linux/digest.h
 -rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/digest.so
 drwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/digest/
+-rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/digest/bubblebabble.so
 -rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/digest/md5.so
 -rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/digest/rmd160.so
 -rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/digest/sha1.so
@@ -164,6 +169,7 @@ drwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/racc/
 -rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/strscan.so
 -rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/syck.so
 -rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/syslog.so
+-rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/thread.so
 -rw-r--r--	root/root	usr/lib/ruby/1.8/linux/util.h
 -rw-r--r--	root/root	usr/lib/ruby/1.8/linux/version.h
 -rwxr-xr-x	root/root	usr/lib/ruby/1.8/linux/zlib.so
diff --git a/ruby/.md5sum b/ruby/.md5sum
index edb5976f5..2a7324345 100644
--- a/ruby/.md5sum
+++ b/ruby/.md5sum
@@ -1,2 +1,2 @@
-d7d12dd9124c9b7d55cdbbee313e3931  ruby-1.8.5-p12.tar.gz
-2d04e0d8fe3b2efdf42832deeb6f58b7  ruby-1.8.5.patch
+23d2494aa94e7ae1ecbbb8c5e1507683  ruby-1.8.6.tar.gz
+b1a97a51713c76db5a8eb211aee9ca99  ruby-arch.patch
diff --git a/ruby/Pkgfile b/ruby/Pkgfile
index 01cc7f503..a43e3e093 100644
--- a/ruby/Pkgfile
+++ b/ruby/Pkgfile
@@ -4,14 +4,14 @@
 # Depends on:  db, gdbm, ncurses, openssl, readline, zlib
 
 name=ruby
-version=1.8.5-p12
+version=1.8.6
 release=1
 source=(ftp://ftp.ruby-lang.org/pub/$name/1.8/$name-$version.tar.gz \
-        $name-1.8.5.patch)
+        $name-arch.patch)
 
 build () {
     cd $name-$version
-    patch -p1 < $SRC/$name-1.8.5.patch
+    patch -p1 < $SRC/$name-arch.patch
     ./configure --prefix=/usr \
                 --mandir=/usr/man \
                 --enable-shared \
diff --git a/ruby/ruby-1.8.5.patch b/ruby/ruby-1.8.5.patch
deleted file mode 100644
index 31e5679f5..000000000
--- a/ruby/ruby-1.8.5.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nru ruby-1.8.5-p12.orig/configure ruby-1.8.5-p12/configure
---- ruby-1.8.5-p12.orig/configure	2006-12-27 19:03:43.539393663 +0100
-+++ ruby-1.8.5-p12/configure	2006-12-27 19:03:56.889006998 +0100
-@@ -19402,7 +19402,7 @@
- _ACEOF
- 
- else
--    arch="${target_cpu}-${target_os}"
-+    arch="${target_os}"
-     cat >>confdefs.h <<_ACEOF
- #define RUBY_PLATFORM "${arch}"
- _ACEOF
diff --git a/ruby/ruby-arch.patch b/ruby/ruby-arch.patch
new file mode 100644
index 000000000..f60e50599
--- /dev/null
+++ b/ruby/ruby-arch.patch
@@ -0,0 +1,12 @@
+diff -Nru ruby-1.8.6.orig/configure ruby-1.8.6/configure
+--- ruby-1.8.6.orig/configure	2007-03-13 16:54:40.000000000 +0100
++++ ruby-1.8.6/configure	2007-03-13 16:54:52.000000000 +0100
+@@ -16957,7 +16957,7 @@
+ _ACEOF
+ 
+ else
+-    arch="${target_cpu}-${target_os}"
++    arch="${target_os}"
+     cat >>confdefs.h <<_ACEOF
+ #define RUBY_PLATFORM "${arch}"
+ _ACEOF