diff --git a/Documentation/sablink/etc/make.conf b/Documentation/sablink/etc/make.conf
index 9d117c6..4029eb9 100644
--- a/Documentation/sablink/etc/make.conf
+++ b/Documentation/sablink/etc/make.conf
@@ -13,8 +13,7 @@ CHOST="armv5tel-softfloat-linux-gnueabi"
 
 source /var/lib/layman/make.conf
 
-#FEATURES="ccache distcc"
-FEATURES="ccache parallel-fetch protect-owned splitdebug buildpkg"
+FEATURES="ccache distcc parallel-fetch protect-owned splitdebug buildpkg"
 #MAKEOPTS="-j7"
 MAKEOPTS="-j2"
 CCACHE_SIZE="20G"
@@ -27,13 +26,11 @@ ACCEPT_LICENSE="*"
 ## USE ARRAYS ##
 LINK_BAD="-kdeprefix -arts -qt3 -beagle -gnome -evo -mono -eds -apm -oss -branding -esd -win32codecs -acpi -opengl"
 LINK_MEDIA="musicbrainz wmf fame cdr mp3rtp xine cddb alsa dvb dvd network dvdread ipod audiofile dvdr cdda mjpeg cpudetection v4l v4l2"
-#dvi
-LINK_CODECS="x264 gsm lame dv mp3 stream live openal theora ogg a52  matroska xvid flac ffmpeg aac speex real dts musepack"
+LINK_CODECS="x264 gsm lame dv mp3 stream live openal theora ogg a52 matroska xvid flac ffmpeg aac speex real dts musepack"
 LINK_SYSTEM="cjk unicode gnutls nptl gcj udev kerberos acl dbus bash-completion lzo rar policykit bzip2 bidi wifi lm_sensors usb bluetooth irda ieee1394"
 LINK_FILESYS="fat hfs jfs xfs ntfs reiserfs sysfs inotify"
 LINK_PRINT="cups ppds foomatic-db gimpprint freetype xprint scanner"
-LINK_XSYS="X gif svg gphoto2 dga lcd openexr"
-##NOTE## png is set in amd64 but not in i686
+LINK_XSYS="gif svg gphoto2 dga lcd openexr png"
 LINK_COMMS="jabber msn yahoo icq irc aim rss slp mail imap"
 
 USE="${LINK_BAD} ${LINK_MEDIA} ${LINK_CODECS} ${LINK_SYSTEM} ${LINK_FILESYS} ${LINK_PRINT} ${LINK_XSYS} ${LINK_COMMS}"
diff --git a/Documentation/sablink/etc/portage/package.use b/Documentation/sablink/etc/portage/package.use
index a52fc97..b067897 100644
--- a/Documentation/sablink/etc/portage/package.use
+++ b/Documentation/sablink/etc/portage/package.use
@@ -22,3 +22,8 @@ sys-auth/consolekit policykit
 
 # doesn't compile with epoll
 net-proxy/squid -epoll
+
+# Required by *-jre-bin
+dev-java/sun-jre-bin X odbc
+dev-java/oracle-jre-bin X odbc
+