diff --git a/config/optimize b/config/optimize
index 206a7ef1d9..f345fcddb0 100644
--- a/config/optimize
+++ b/config/optimize
@@ -1,5 +1,5 @@
 if [ "$OPTIMIZATIONS" = speed ];then
-  GCC_OPTIM="-O4"
+  GCC_OPTIM="-O3"
   LD_OPTIM=""
 fi
 
diff --git a/packages/debug/meta b/packages/debug/meta
index 36902735c1..ff44ed3546 100644
--- a/packages/debug/meta
+++ b/packages/debug/meta
@@ -5,7 +5,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan tools"
+PKG_DEPENDS="strace gdb mesa-demos tvdump w_scan tools htop"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"
diff --git a/packages/linux/meta b/packages/linux/meta
index eeadee0469..808c49ca1d 100644
--- a/packages/linux/meta
+++ b/packages/linux/meta
@@ -1,5 +1,5 @@
 PKG_NAME="linux"
-PKG_VERSION="2.6.37-rc6"
+PKG_VERSION="2.6.37-rc7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -17,6 +17,6 @@ PKG_IS_ADDON="no"
 PKG_AUTORECONF="no"
 
 if [ "$LINUX_NEXT" = "yes" ]; then
-  PKG_VERSION="2.6.37-rc6"
+  PKG_VERSION="2.6.37-rc7"
   PKG_URL="http://www.kernel.org/pub/linux/kernel/v2.6/testing/$PKG_NAME-$PKG_VERSION.tar.bz2"
 fi
diff --git a/packages/linux/patches/linux-2.6.37-rc6-000_crosscompile.patch b/packages/linux/patches/linux-2.6.37-rc7-000_crosscompile.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-000_crosscompile.patch
rename to packages/linux/patches/linux-2.6.37-rc7-000_crosscompile.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-002_bash_only_feature.patch b/packages/linux/patches/linux-2.6.37-rc7-002_bash_only_feature.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-002_bash_only_feature.patch
rename to packages/linux/patches/linux-2.6.37-rc7-002_bash_only_feature.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-003-no_dev_console.patch b/packages/linux/patches/linux-2.6.37-rc7-003-no_dev_console.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-003-no_dev_console.patch
rename to packages/linux/patches/linux-2.6.37-rc7-003-no_dev_console.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-004_lower_undefined_mode_timeout.patch b/packages/linux/patches/linux-2.6.37-rc7-004_lower_undefined_mode_timeout.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-004_lower_undefined_mode_timeout.patch
rename to packages/linux/patches/linux-2.6.37-rc7-004_lower_undefined_mode_timeout.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-005_kconfig_no_timestamp.patch b/packages/linux/patches/linux-2.6.37-rc7-005_kconfig_no_timestamp.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-005_kconfig_no_timestamp.patch
rename to packages/linux/patches/linux-2.6.37-rc7-005_kconfig_no_timestamp.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-006_enable_utf8.patch b/packages/linux/patches/linux-2.6.37-rc7-006_enable_utf8.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-006_enable_utf8.patch
rename to packages/linux/patches/linux-2.6.37-rc7-006_enable_utf8.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-007_die_floppy_die.patch b/packages/linux/patches/linux-2.6.37-rc7-007_die_floppy_die.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-007_die_floppy_die.patch
rename to packages/linux/patches/linux-2.6.37-rc7-007_die_floppy_die.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-008-hda_intel_prealloc_4mb_dmabuffer.patch b/packages/linux/patches/linux-2.6.37-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-008-hda_intel_prealloc_4mb_dmabuffer.patch
rename to packages/linux/patches/linux-2.6.37-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-009_disable_i8042_check_on_apple_mac.patch b/packages/linux/patches/linux-2.6.37-rc7-009_disable_i8042_check_on_apple_mac.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-009_disable_i8042_check_on_apple_mac.patch
rename to packages/linux/patches/linux-2.6.37-rc7-009_disable_i8042_check_on_apple_mac.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-050_add_appleir_usb_driver.patch b/packages/linux/patches/linux-2.6.37-rc7-050_add_appleir_usb_driver.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-050_add_appleir_usb_driver.patch
rename to packages/linux/patches/linux-2.6.37-rc7-050_add_appleir_usb_driver.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-052-aureal_remote_quirk-0.1.patch b/packages/linux/patches/linux-2.6.37-rc7-052-aureal_remote_quirk-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-052-aureal_remote_quirk-0.1.patch
rename to packages/linux/patches/linux-2.6.37-rc7-052-aureal_remote_quirk-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-053_ati-remote_all_keys_and_keychange-0.1.patch b/packages/linux/patches/linux-2.6.37-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-053_ati-remote_all_keys_and_keychange-0.1.patch
rename to packages/linux/patches/linux-2.6.37-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch
diff --git a/packages/linux/patches/linux-2.6.37-rc6-110-drm_nouveau_upstream-20101217.patch b/packages/linux/patches/linux-2.6.37-rc7-110-drm_nouveau_upstream-20101217.patch
similarity index 100%
rename from packages/linux/patches/linux-2.6.37-rc6-110-drm_nouveau_upstream-20101217.patch
rename to packages/linux/patches/linux-2.6.37-rc7-110-drm_nouveau_upstream-20101217.patch
diff --git a/packages/tools/meta b/packages/tools/meta
index 5fbb236fe1..6423f7dc70 100644
--- a/packages/tools/meta
+++ b/packages/tools/meta
@@ -5,7 +5,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="htop nano wgetpaste evtest"
+PKG_DEPENDS="nano wgetpaste evtest"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="debug"