diff --git a/packages/linux/meta b/packages/linux/meta
index 5f218965e3..bacaf9008f 100644
--- a/packages/linux/meta
+++ b/packages/linux/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="linux"
-PKG_VERSION="3.7.3"
+PKG_VERSION="3.7.4"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/linux/patches/3.7.3/linux-203-stb0899_enable_low_symbol_rate.patch b/packages/linux/patches/3.7.4/linux-203-stb0899_enable_low_symbol_rate.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-203-stb0899_enable_low_symbol_rate.patch
rename to packages/linux/patches/3.7.4/linux-203-stb0899_enable_low_symbol_rate.patch
diff --git a/packages/linux/patches/3.7.3/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch b/packages/linux/patches/3.7.4/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch
rename to packages/linux/patches/3.7.4/linux-206.01-media-ene-ir-Fix-cleanup-on-probe-failure.patch
diff --git a/packages/linux/patches/3.7.3/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch b/packages/linux/patches/3.7.4/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch
rename to packages/linux/patches/3.7.4/linux-206.02-media-rc-Make-probe-cleanup-goto-labels-more-verbose.patch
diff --git a/packages/linux/patches/3.7.3/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch b/packages/linux/patches/3.7.4/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch
rename to packages/linux/patches/3.7.4/linux-206.03-media-rc-Set-rdev-before-irq-setup.patch
diff --git a/packages/linux/patches/3.7.3/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch b/packages/linux/patches/3.7.4/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch
rename to packages/linux/patches/3.7.4/linux-206.04-media-rc-Call-rc_register_device-before-irq-setup.patch
diff --git a/packages/linux/patches/3.7.3/linux-210-dvbsky.patch b/packages/linux/patches/3.7.4/linux-210-dvbsky.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-210-dvbsky.patch
rename to packages/linux/patches/3.7.4/linux-210-dvbsky.patch
diff --git a/packages/linux/patches/3.7.3/linux-212-mantis_stb0899_faster_lock.patch b/packages/linux/patches/3.7.4/linux-212-mantis_stb0899_faster_lock.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-212-mantis_stb0899_faster_lock.patch
rename to packages/linux/patches/3.7.4/linux-212-mantis_stb0899_faster_lock.patch
diff --git a/packages/linux/patches/3.7.3/linux-213-cinergy_s2_usb_r2.patch b/packages/linux/patches/3.7.4/linux-213-cinergy_s2_usb_r2.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-213-cinergy_s2_usb_r2.patch
rename to packages/linux/patches/3.7.4/linux-213-cinergy_s2_usb_r2.patch
diff --git a/packages/linux/patches/3.7.3/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch b/packages/linux/patches/3.7.4/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch
rename to packages/linux/patches/3.7.4/linux-214-rtl28xxu_add_NOXON_USB_dongle_rev.2.patch
diff --git a/packages/linux/patches/3.7.3/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch b/packages/linux/patches/3.7.4/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch
rename to packages/linux/patches/3.7.4/linux-215-rtl28xxu_ASUS_My_Cinema-U3100Mini_Plus_V2.patch
diff --git a/packages/linux/patches/3.7.3/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch b/packages/linux/patches/3.7.4/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch
rename to packages/linux/patches/3.7.4/linux-216-rtl28xxu_add_Gigabyte_U7300_DVB-T_Dongle.patch
diff --git a/packages/linux/patches/3.7.3/linux-221-ngene-octopus.patch b/packages/linux/patches/3.7.4/linux-221-ngene-octopus.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-221-ngene-octopus.patch
rename to packages/linux/patches/3.7.4/linux-221-ngene-octopus.patch
diff --git a/packages/linux/patches/3.7.3/linux-222-stb0899_signal_quality.patch b/packages/linux/patches/3.7.4/linux-222-stb0899_signal_quality.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-222-stb0899_signal_quality.patch
rename to packages/linux/patches/3.7.4/linux-222-stb0899_signal_quality.patch
diff --git a/packages/linux/patches/3.7.3/linux-700-jmicron_1_0_8_5.patch b/packages/linux/patches/3.7.4/linux-700-jmicron_1_0_8_5.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-700-jmicron_1_0_8_5.patch
rename to packages/linux/patches/3.7.4/linux-700-jmicron_1_0_8_5.patch
diff --git a/packages/linux/patches/3.7.3/linux-950-saa716x_PCIe_interface_chipset.patch b/packages/linux/patches/3.7.4/linux-950-saa716x_PCIe_interface_chipset.patch
similarity index 100%
rename from packages/linux/patches/3.7.3/linux-950-saa716x_PCIe_interface_chipset.patch
rename to packages/linux/patches/3.7.4/linux-950-saa716x_PCIe_interface_chipset.patch
diff --git a/packages/network/samba/meta b/packages/network/samba/meta
index 0048628ba8..02ce613ccb 100644
--- a/packages/network/samba/meta
+++ b/packages/network/samba/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="samba"
-PKG_VERSION="3.6.10"
+PKG_VERSION="3.6.11"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/network/samba/patches/rename.sh b/packages/network/samba/patches/rename.sh
deleted file mode 100755
index 4c34ed5770..0000000000
--- a/packages/network/samba/patches/rename.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
-#      Copyright (C) 2010-2011 Roman Weber (roman@openelec.tv)
-#
-#  This Program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2, or (at your option)
-#  any later version.
-#
-#  This Program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-
-for i in `ls samba-$1-*.patch`; do
-  mv $i `echo $i | sed "s,$1,$2,g"`
-done
diff --git a/packages/network/samba/patches/samba-3.6.10-010_crosscompile-0.1.patch b/packages/network/samba/patches/samba-010_crosscompile-0.1.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-010_crosscompile-0.1.patch
rename to packages/network/samba/patches/samba-010_crosscompile-0.1.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-110-multicall.patch b/packages/network/samba/patches/samba-110-multicall.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-110-multicall.patch
rename to packages/network/samba/patches/samba-110-multicall.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-120-add_missing_ifdef.patch b/packages/network/samba/patches/samba-120-add_missing_ifdef.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-120-add_missing_ifdef.patch
rename to packages/network/samba/patches/samba-120-add_missing_ifdef.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-200-remove_printer_support.patch b/packages/network/samba/patches/samba-200-remove_printer_support.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-200-remove_printer_support.patch
rename to packages/network/samba/patches/samba-200-remove_printer_support.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-210-remove_ad_support.patch b/packages/network/samba/patches/samba-210-remove_ad_support.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-210-remove_ad_support.patch
rename to packages/network/samba/patches/samba-210-remove_ad_support.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-220-remove_services.patch b/packages/network/samba/patches/samba-220-remove_services.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-220-remove_services.patch
rename to packages/network/samba/patches/samba-220-remove_services.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-230-remove_winreg_support.patch b/packages/network/samba/patches/samba-230-remove_winreg_support.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-230-remove_winreg_support.patch
rename to packages/network/samba/patches/samba-230-remove_winreg_support.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-240-remove_dfs_api.patch b/packages/network/samba/patches/samba-240-remove_dfs_api.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-240-remove_dfs_api.patch
rename to packages/network/samba/patches/samba-240-remove_dfs_api.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-250-remove_domain_logon.patch b/packages/network/samba/patches/samba-250-remove_domain_logon.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-250-remove_domain_logon.patch
rename to packages/network/samba/patches/samba-250-remove_domain_logon.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-260-remove_samr.patch b/packages/network/samba/patches/samba-260-remove_samr.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-260-remove_samr.patch
rename to packages/network/samba/patches/samba-260-remove_samr.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-270-remove_registry_backend.patch b/packages/network/samba/patches/samba-270-remove_registry_backend.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-270-remove_registry_backend.patch
rename to packages/network/samba/patches/samba-270-remove_registry_backend.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-280-strip_srvsvc.patch b/packages/network/samba/patches/samba-280-strip_srvsvc.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-280-strip_srvsvc.patch
rename to packages/network/samba/patches/samba-280-strip_srvsvc.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-290-remove_lsa.patch b/packages/network/samba/patches/samba-290-remove_lsa.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-290-remove_lsa.patch
rename to packages/network/samba/patches/samba-290-remove_lsa.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-300-assert_debug_level.patch b/packages/network/samba/patches/samba-300-assert_debug_level.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-300-assert_debug_level.patch
rename to packages/network/samba/patches/samba-300-assert_debug_level.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-310-remove_error_strings.patch b/packages/network/samba/patches/samba-310-remove_error_strings.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-310-remove_error_strings.patch
rename to packages/network/samba/patches/samba-310-remove_error_strings.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-320-debug_level_checks.patch b/packages/network/samba/patches/samba-320-debug_level_checks.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-320-debug_level_checks.patch
rename to packages/network/samba/patches/samba-320-debug_level_checks.patch
diff --git a/packages/network/samba/patches/samba-3.6.10-330-librpc_default_print.patch b/packages/network/samba/patches/samba-330-librpc_default_print.patch
similarity index 100%
rename from packages/network/samba/patches/samba-3.6.10-330-librpc_default_print.patch
rename to packages/network/samba/patches/samba-330-librpc_default_print.patch
diff --git a/packages/security/nettle/build b/packages/security/nettle/build
index c20c390150..e8a004050f 100755
--- a/packages/security/nettle/build
+++ b/packages/security/nettle/build
@@ -28,7 +28,7 @@ cd $PKG_BUILD
             --prefix=/usr \
             --sysconfdir=/etc \
             --localstatedir=/var \
-            --disable-static \
+            --enable-static \
             --enable-shared \
             --disable-openssl \
             --with-gnu-ld
diff --git a/packages/security/nettle/meta b/packages/security/nettle/meta
index 4204a81b9a..c9181766e2 100644
--- a/packages/security/nettle/meta
+++ b/packages/security/nettle/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="nettle"
-PKG_VERSION="2.5"
+PKG_VERSION="2.6"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/tools/u-boot/patches/README b/packages/tools/u-boot/patches/2011.03-rc1/README
similarity index 100%
rename from packages/tools/u-boot/patches/README
rename to packages/tools/u-boot/patches/2011.03-rc1/README
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0001-mkimage-Add-OMAP-boot-image-support.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0001-mkimage-Add-OMAP-boot-image-support.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0001-mkimage-Add-OMAP-boot-image-support.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0001-mkimage-Add-OMAP-boot-image-support.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0002-omap-add-miscellaneous-utility-macros-for-bit-field-.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0002-omap-add-miscellaneous-utility-macros-for-bit-field-.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0002-omap-add-miscellaneous-utility-macros-for-bit-field-.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0002-omap-add-miscellaneous-utility-macros-for-bit-field-.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0003-omap4-add-OMAP4430-revision-check.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0003-omap4-add-OMAP4430-revision-check.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0003-omap4-add-OMAP4430-revision-check.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0003-omap4-add-OMAP4430-revision-check.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0004-armv7-start.S-provide-a-hook-for-saving-boot-params.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0004-armv7-start.S-provide-a-hook-for-saving-boot-params.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0004-armv7-start.S-provide-a-hook-for-saving-boot-params.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0004-armv7-start.S-provide-a-hook-for-saving-boot-params.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0005-omap4-save-parameters-passed-by-ROM-code-to-SPL.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0005-omap4-save-parameters-passed-by-ROM-code-to-SPL.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0005-omap4-save-parameters-passed-by-ROM-code-to-SPL.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0005-omap4-save-parameters-passed-by-ROM-code-to-SPL.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0006-arm-new-labels-in-the-linker-script-file.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0006-arm-new-labels-in-the-linker-script-file.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0006-arm-new-labels-in-the-linker-script-file.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0006-arm-new-labels-in-the-linker-script-file.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0007-Add-generic-spl-infrastructure.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0007-Add-generic-spl-infrastructure.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0007-Add-generic-spl-infrastructure.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0007-Add-generic-spl-infrastructure.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0008-armv7-start.S-add-SPL-support.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0008-armv7-start.S-add-SPL-support.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0008-armv7-start.S-add-SPL-support.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0008-armv7-start.S-add-SPL-support.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0009-omap-add-spl-support.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0009-omap-add-spl-support.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0009-omap-add-spl-support.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0009-omap-add-spl-support.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0010-omap4-add-spl-support-for-OMAP4-SDP.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0010-omap4-add-spl-support-for-OMAP4-SDP.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0010-omap4-add-spl-support-for-OMAP4-SDP.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0010-omap4-add-spl-support-for-OMAP4-SDP.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0011-omap4-add-serial-console-support-to-SPL.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0011-omap4-add-serial-console-support-to-SPL.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0011-omap4-add-serial-console-support-to-SPL.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0011-omap4-add-serial-console-support-to-SPL.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0012-omap4-utility-function-to-identify-the-context-of-hw.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0012-omap4-utility-function-to-identify-the-context-of-hw.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0012-omap4-utility-function-to-identify-the-context-of-hw.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0012-omap4-utility-function-to-identify-the-context-of-hw.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0013-omap4-separate-mux-settings-into-essential-and-non-e.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0013-omap4-separate-mux-settings-into-essential-and-non-e.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0013-omap4-separate-mux-settings-into-essential-and-non-e.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0013-omap4-separate-mux-settings-into-essential-and-non-e.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0014-omap4-correct-mux-data-for-sdp4430.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0014-omap4-correct-mux-data-for-sdp4430.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0014-omap4-correct-mux-data-for-sdp4430.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0014-omap4-correct-mux-data-for-sdp4430.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0015-omap4-add-clock-support.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0015-omap4-add-clock-support.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0015-omap4-add-clock-support.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0015-omap4-add-clock-support.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0016-omap4-add-sdram-init-support.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0016-omap4-add-sdram-init-support.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0016-omap4-add-sdram-init-support.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0016-omap4-add-sdram-init-support.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0017-omap4-calculate-EMIF-register-values.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0017-omap4-calculate-EMIF-register-values.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0017-omap4-calculate-EMIF-register-values.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0017-omap4-calculate-EMIF-register-values.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0018-omap4-automatic-sdram-detection.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0018-omap4-automatic-sdram-detection.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0018-omap4-automatic-sdram-detection.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0018-omap4-automatic-sdram-detection.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0019-armv7-embed-u-boot-size-within-u-boot-for-use-from-S.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0019-armv7-embed-u-boot-size-within-u-boot-for-use-from-S.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0019-armv7-embed-u-boot-size-within-u-boot-for-use-from-S.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0019-armv7-embed-u-boot-size-within-u-boot-for-use-from-S.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0020-omap-add-MMC-support-to-SPL.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0020-omap-add-MMC-support-to-SPL.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0020-omap-add-MMC-support-to-SPL.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0020-omap-add-MMC-support-to-SPL.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0021-omap-spl-add-FAT-support-over-MMC.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0021-omap-spl-add-FAT-support-over-MMC.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0021-omap-spl-add-FAT-support-over-MMC.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0021-omap-spl-add-FAT-support-over-MMC.patch
diff --git a/packages/tools/u-boot/patches/u-boot-2011.03-rc1-0022-omap4-add-spl-support-for-OMAP4-Panda.patch b/packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0022-omap4-add-spl-support-for-OMAP4-Panda.patch
similarity index 100%
rename from packages/tools/u-boot/patches/u-boot-2011.03-rc1-0022-omap4-add-spl-support-for-OMAP4-Panda.patch
rename to packages/tools/u-boot/patches/2011.03-rc1/u-boot-2011.03-rc1-0022-omap4-add-spl-support-for-OMAP4-Panda.patch
diff --git a/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-automake-1.13.patch b/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-automake-1.13.patch
new file mode 100644
index 0000000000..af0808d59a
--- /dev/null
+++ b/packages/x11/driver/xf86-video-dove/patches/xf86-video-dove-0.3.4-automake-1.13.patch
@@ -0,0 +1,12 @@
+diff -Naur xf86-video-dove-0.3.4/configure.ac xf86-video-dove-0.3.4.patch/configure.ac
+--- xf86-video-dove-0.3.4/configure.ac	2011-03-07 18:52:09.000000000 +0100
++++ xf86-video-dove-0.3.4.patch/configure.ac	2013-01-22 13:30:57.420372292 +0100
+@@ -27,7 +27,7 @@
+         xf86-video-mrvl)
+ 
+ AC_CONFIG_SRCDIR([Makefile.am])
+-AM_CONFIG_HEADER([config.h])
++AC_CONFIG_HEADERS([config.h])
+ AC_CONFIG_AUX_DIR(.)
+ 
+ AM_INIT_AUTOMAKE([dist-bzip2])
diff --git a/packages/x11/lib/libX11/build b/packages/x11/lib/libX11/build
index 463c5368e8..d5d6b22443 100755
--- a/packages/x11/lib/libX11/build
+++ b/packages/x11/lib/libX11/build
@@ -24,11 +24,9 @@
 
 export CC_FOR_BUILD="$HOST_CC"
 export CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
-export CFLAGS_FOR_BUILD="$HOST_CFLAGS -I$SYSROOT_PREFIX/usr/include"
+export CFLAGS_FOR_BUILD="$HOST_CFLAGS"
 export LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
 
-export PKG_CONFIG="$PKG_CONFIG --define-variable=prefix=$SYSROOT_PREFIX/usr"
-
 cd $PKG_BUILD
 
 ./configure --host=$TARGET_NAME \
diff --git a/packages/x11/lib/libX11/meta b/packages/x11/lib/libX11/meta
index 6ff2fd1dbd..df20051573 100644
--- a/packages/x11/lib/libX11/meta
+++ b/packages/x11/lib/libX11/meta
@@ -26,7 +26,7 @@ PKG_LICENSE="OSS"
 PKG_SITE="http://www.x.org/"
 PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="libXau libxcb"
-PKG_BUILD_DEPENDS="toolchain util-macros xextproto xcmiscproto bigreqsproto kbproto inputproto xtrans libXau libxcb util-macros"
+PKG_BUILD_DEPENDS="toolchain xproto-host xproto util-macros xextproto xcmiscproto bigreqsproto kbproto inputproto xtrans libXau libxcb util-macros"
 PKG_PRIORITY="optional"
 PKG_SECTION="x11/lib"
 PKG_SHORTDESC="libx11: The X11 library"
diff --git a/packages/x11/lib/libX11/patches/libX11-1.5.0-pkg_config.patch b/packages/x11/lib/libX11/patches/libX11-1.5.0-pkg_config.patch
new file mode 100644
index 0000000000..2f03f45302
--- /dev/null
+++ b/packages/x11/lib/libX11/patches/libX11-1.5.0-pkg_config.patch
@@ -0,0 +1,20 @@
+diff -Naur libX11-1.5.0-old/configure.ac libX11-1.5.0-new/configure.ac
+--- libX11-1.5.0-old/configure.ac	2012-06-01 23:37:17.000000000 -0700
++++ libX11-1.5.0-new/configure.ac	2012-06-02 09:13:08.000000000 -0700
+@@ -35,6 +35,7 @@
+ 
+ # Required when PKG_CHECK_MODULES called within an if statement
+ PKG_PROG_PKG_CONFIG
++m4_pattern_allow([^PKG_CONFIG_SYSROOT_DIR$])
+ 
+ if test x"$CC_FOR_BUILD" = x; then
+ 	if test x"$cross_compiling" = xyes; then
+@@ -306,7 +307,7 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysym definitions])
+-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++KEYSYMDEFDIR=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=includedir xproto`/X11
+ FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+ for i in $FILES; do
+     if test -f "$KEYSYMDEFDIR/$i"; then