Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

author: Luke Shumaker <LukeShu@sbcglobal.net> 2012-10-09 21:55:49 -0400
committer: Luke Shumaker <LukeShu@sbcglobal.net> 2012-10-09 21:55:49 -0400
commit: 42a5749cf083ca141ea356263cf5ad0000f5da12 (patch)
tree: 5dd2824f43e6c2af95281af174c7e8c1cb7b29b7
parent: ad1725db924d8330ec3c9cd738f214f51fbc4504 (diff)
parent: 533189fa3e72bb81b1904365f40d8fbd4ef78690 (diff)
63 files changed, 1517 insertions, 1512 deletions
diff --git a/kernels/linux-libre-lts-api-headers/PKGBUILD b/kernels/linux-libre-lts-api-headers/PKGBUILD
new file mode 100755
index 000000000..6bf0e3ca6
--- /dev/null
+++ b/kernels/linux-libre-lts-api-headers/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: $
+# Maintainer: André Silva <emulatorman@lavabit.com>
+
+pkgname=linux-libre-lts-api-headers
+_basekernel=3.0
+_sublevel=44
+pkgver=${_basekernel}.${_sublevel}
+pkgrel=1
+pkgdesc="Kernel libre lts headers sanitized for use in userspace - stable longtime supported kernel package suitable for servers"
+arch=('i686' 'x86_64' 'mips64el')
+url="http://www.gnu.org/software/libc"
+license=('GPL2')
+provides=("linux-api-headers=3.5" "linux-libre-api-headers=3.5")
+conflicts=('linux-api-headers' 'linux-libre-api-headers')
+replaces=('linux-api-headers' 'linux-libre-api-headers')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
+        "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
+md5sums=('5f64180fe7df4e574dac5911b78f5067'
+         '6daa8be01b49423178082ebf5f615a24')
+
+build() {
+  cd ${srcdir}/linux-${_basekernel}
+
+  if [ "${_basekernel}" != "${pkgver}" ]; then
+    patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu"
+  fi
+
+  make mrproper
+  make headers_check
+}
+
+package() {
+  cd ${srcdir}/linux-${_basekernel}
+  make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
+
+  # use headers from libdrm
+  rm -rf ${pkgdir}/usr/include/drm
+  
+  # clean-up unnecessary files generated during install
+  find ${pkgdir} \( -name .install -o -name ..install.cmd \) -delete
+}
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
index 64bcc5bb4..5afccbcfb 100644
--- a/libre/cdfs-libre/PKGBUILD
+++ b/libre/cdfs-libre/PKGBUILD
@@ -6,7 +6,7 @@
 _pkgname=cdfs
 pkgname=cdfs-libre
 pkgver=2.6.27
-pkgrel=28
+pkgrel=31
 pkgdesc="File system module libre that 'exports' all tracks and boot images on a CD as normal files."
 arch=(i686 x86_64)
 url="http://www.elis.UGent.be/~ronsse/cdfs/"
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
index 1c3cb4f8e..aa71a92ac 100644
--- a/libre/cdfs-libre/cdfs.install
+++ b/libre/cdfs-libre/cdfs.install
@@ -1,14 +1,14 @@
 post_install() {
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 49e837e02..32be5dd3c 100755
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165634 2012-08-27 20:15:48Z tomegun $
+# $Id: PKGBUILD 167924 2012-10-03 20:35:33Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=filesystem
-pkgver=2012.8
-pkgrel=1.2
+pkgver=2012.10
+pkgrel=1
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
@@ -90,13 +90,13 @@ package() {
 	done
 	ln -s ../man usr/local/share/man
 }
-md5sums=('45940618da782cc391c59f88ab3333c3'
+md5sums=('004013ac940ef3d3cdd8c596e7accfe1'
          '6be47d893fd49b2e4a8c0e811b350861'
          '13753e4e0964f3652b0cc60a28528bdf'
          '4c4540eeb748bf1f71d631b8c1dcf0b3'
          'f28150d4c0b22a017be51b9f7f9977ed'
          '6e488ffecc8ba142c0cf7e2d7aeb832e'
-         '8a9042a2cedf6b6b47eb8973f14289cb'
+         '455b78cada80f40b6f6968f5cbd97a2e'
          'b8355d9d2782f424f4cedcf682651be0'
          'ca716f853860199c1286e7939b2f2666'
          '1745349eb24ed21b4cfaa6f423bddb76'
@@ -105,7 +105,7 @@ md5sums=('45940618da782cc391c59f88ab3333c3'
          '0e145e18fea8fd190b30d45764f5707c'
          '6f48288b6fcaf0065fcb7b0e525413e0'
          '22518e922891f9359f971f4f5b4e793c'
-         'f95416882cef800edef08382a1176b7d'
+         '677523dbe94b79299aa91b35ed8203b6'
          'f3b6ae7db8adffaaa4bffc6099dcbd50'
          'a8a962370cd0128465d514e6a1f74130'
          '3674fcb22044d2946934e7826aa0c632'
diff --git a/libre/filesystem/filesystem.install b/libre/filesystem/filesystem.install
index c8717f01b..34fcc0dee 100755
--- a/libre/filesystem/filesystem.install
+++ b/libre/filesystem/filesystem.install
@@ -41,8 +41,10 @@ post_upgrade() {
 	_addgroup scanner -g 96
 	_addgroup rfkill  -g 24
 	_addgroup lock    -g 54
+	_addgroup uuidd   -g 68
+	_adduser uuidd   -u 68 -d / -g uuidd -s /sbin/nologin
 
-	# sync gshadow to group (fixes FS#19869
+	# sync gshadow to group (fixes FS#19869)
 	if ! grep -q '^lock:' etc/gshadow; then
 		grpconv >/dev/null
 	fi
diff --git a/libre/filesystem/group b/libre/filesystem/group
index 6e8e773d8..cfee1f23e 100755
--- a/libre/filesystem/group
+++ b/libre/filesystem/group
@@ -20,6 +20,7 @@ smmsp:x:25:
 http:x:33:
 games:x:50:
 lock:x:54:
+uuidd:x:68:
 network:x:90:
 video:x:91:
 audio:x:92:
diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow
index c5c76354e..c5ac18581 100755
--- a/libre/filesystem/gshadow
+++ b/libre/filesystem/gshadow
@@ -20,6 +20,7 @@ smmsp:::
 http:::
 games:::
 lock:::
+uuidd:!::
 network:x::
 video:x::
 audio:::
diff --git a/libre/filesystem/passwd b/libre/filesystem/passwd
index a4a24e34f..cb9fec7ff 100755
--- a/libre/filesystem/passwd
+++ b/libre/filesystem/passwd
@@ -4,4 +4,5 @@ daemon:x:2:2:daemon:/sbin:/bin/false
 mail:x:8:12:mail:/var/spool/mail:/bin/false
 ftp:x:14:11:ftp:/srv/ftp:/bin/false
 http:x:33:33:http:/srv/http:/bin/false
+uuidd:x:68:68:uuidd:/:/sbin/nologin
 nobody:x:99:99:nobody:/:/bin/false
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index cde66e1db..1f68a6356 100755
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 164178 2012-07-26 23:40:45Z tomegun $
+# $Id: PKGBUILD 167943 2012-10-03 23:12:35Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2012.09.1
+pkgver=2012.10.5
 pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('any')
@@ -16,21 +16,22 @@ provides=('initscripts-systemd')
 conflicts=('initscripts-systemd')
 replaces=('initscripts-systemd')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
-depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit')
+depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools')
 optdepends=('dhcpcd: DHCP network configuration'
             'bridge-utils: Legacy network bridging support'
             'net-tools: Legacy network support'
-            'wireless_tools: Legacy wireless networking')
+            'wireless_tools: Legacy wireless networking'
+            'sysvinit: Legacy init support')
 makedepends=(asciidoc)
 install=initscripts.install
 source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig})
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install
 
-  # moved to filesystem
-  rm -rf ${pkgdir}/etc/profile.d
+  make DESTDIR=${pkgdir} install
 }
 md5sums=('16039aeb4c996194d9466a8c66a06f5a'
          '522804c7981c32c3c779964844d64377')
+md5sums=('3be94446496bda58051141e0d3863a7b'
+         '3f03d3a5c7d8b7e1ddebb13334441440')
diff --git a/libre/initscripts/split-hwclock-calls.diff b/libre/initscripts/split-hwclock-calls.diff
new file mode 100644
index 000000000..c0a6a4fd6
--- /dev/null
+++ b/libre/initscripts/split-hwclock-calls.diff
@@ -0,0 +1,21 @@
+diff --git a/rc.sysinit b/rc.sysinit
+index eb49e2b..8f9727b 100755
+--- a/rc.sysinit
++++ b/rc.sysinit
+@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid
+ 
+ run_hook sysinit_start
+ 
+-HWCLOCK_PARAMS="--systz"
+ case $HARDWARECLOCK in
+ 	"") ;;
+ 	UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";;
+@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then
+ 
+ 	[[ $TIMEZONE ]] && export TZ=$TIMEZONE
+ 
+-	hwclock $HWCLOCK_PARAMS && stat_done || stat_fail
++	{ hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done || stat_fail
+ 
+ 	unset TZ
+ fi
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index f69e561be..17fafa08c 100755
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 _pkgname='kdebase-konqueror'
 pkgname='kdebase-konqueror-libre'
-pkgver=4.9.1
+pkgver=4.9.2
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://kde.org/applications/internet/konqueror/"
@@ -15,7 +15,7 @@ groups=('kde' 'kdebase')
 makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml')
 source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz"
     	"konq-about-fsdg.diff")
-sha1sums=('9014332fd6fb18999c8290a3cbb498793d8caa2f'
+sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66'
           'f41541371414dcbe5e76687835e648112b3ff364')
 pkgdesc='KDE File Manager & Web Browser'
 depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index ba6273763..bcf1c0922 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkgname=kdebase-runtime
 pkgname=kdebase-runtime-libre
-pkgver=4.9.1
+pkgver=4.9.2
 pkgrel=1
 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -25,7 +25,7 @@ provides=("${_pkgname}=${pkgver}")
 install="${_pkgname}.install"
 source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz"
         'duckduckgo_lite.desktop')
-sha1sums=('4b67e0f12617c478ee29546da4d98f605cd35dec'
+sha1sums=('97c811e404322e520f62320c919eecd73db8c5dd'
           '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85')
 
 build() {
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index e5fdb1ea6..ce44c6bcd 100755
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165921 2012-09-03 21:48:13Z andrea $
+# $Id: PKGBUILD 167425 2012-10-02 09:09:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
-pkgver=4.9.1
+pkgver=4.9.2
 pkgrel=1
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
@@ -25,7 +25,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.
         'kde-applications-menu.patch'
         'use-pythondontwritebytecode.patch'
         'khtml-fsdg.diff')
-sha1sums=('33fb26ec7735122b2bb084b79f8fcffb826c58f0'
+sha1sums=('e86ee16ac7c412b0f6abe3754cb372a45d41c71b'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
           'a1502a964081ad583a00cf90c56e74bf60121830')
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 7b7d47180..d5211499b 100755
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -5,8 +5,8 @@
 
 pkgbase=kdenetwork
 pkgname=('kdenetwork-kopete-libre')
-pkgver=4.9.1
-pkgrel=3
+pkgver=4.9.2
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp'
     'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
     'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('22f8cde8b5617ba7e401d82b0669a06899b17320')
+sha1sums=('6779039e5354fae02cf7faa3442385b95befb430')
 
 build() {
     cd "${srcdir}"
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index a71990231..68954e29b 100755
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -4,7 +4,7 @@
 
 _pkgname=kdeutils-ark
 pkgname=kdeutils-ark-libre
-pkgver=4.9.1
+pkgver=4.9.2
 pkgrel=1
 pkgdesc='Archiving Tool'
 url='http://kde.org/applications/utilities/ark/'
@@ -19,7 +19,7 @@ provides=("kdeutils-ark=$pkgver")
 replaces=('kdeutils-ark')
 conflicts=('kdeutils-ark')
 source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz")
-sha1sums=('2f7d32b9f99913d14801b56f0c858eda128a7b91')
+sha1sums=('180ad836ebfc6bdc26d245e6bd27c2fc7a59918c')
 
 build() {
   cd "${srcdir}"
diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD
index be5acfd2f..fcc53e9d9 100755
--- a/libre/kile-libre/PKGBUILD
+++ b/libre/kile-libre/PKGBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kile
 pkgname=kile-libre
-pkgver=2.1.2
+pkgver=2.1.3
 pkgrel=1
 pkgdesc="A user friendly TeX/LaTeX frontend for KDE"
 arch=("i686" "x86_64")
@@ -20,7 +20,7 @@ provides=('kile')
 install=${_pkgname}.install
 source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2"
         "no-acroread.patch")
-sha1sums=('238a8fde4fca00e06b314c13671ff53e2ac4845c'
+sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5'
           '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6')
 
 build() {
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index cf0ecaa08..582234b13 100755
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -5,8 +5,8 @@
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.8.8
-pkgrel=1.2
+pkgver=1.8.9
+pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs"
 arch=('i686' 'x86_64')
 url="http://liferea.sourceforge.net/"
@@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs')
 install=liferea.install
 source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz
         remove-non-free-suggestions.patch)
-sha1sums=('9dfbf5ff8bd91060bdea93d74c37a8a828a2edfe'
+sha1sums=('35452b46d987ba37d5a81ea3e4c0f7199c9c0403'
           '0d68c567c3d37932a49709c58c37c3f138fd19cb')
 
 build() {
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index cf2fdca23..2aaf0e3fc 100755
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -6,7 +6,7 @@
 
 pkgname=linux-libre-api-headers
 _basekernel=3.5
-_sublevel=1
+_sublevel=5
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
 pkgdesc="Kernel libre headers sanitized for use in userspace"
@@ -19,7 +19,7 @@ replaces=('linux-api-headers')
 source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz"
         "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz")
 md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
-         '67b650dd355fbca16035510df063420b')
+         '2e138b46c5855fff8e0d7afe760a4150')
 
 build() {
   cd ${srcdir}/linux-${_basekernel}
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
new file mode 100644
index 000000000..dd43819fe
--- /dev/null
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -0,0 +1,49 @@
+# Maintainer: André Silva <emulatorman@lavabit.com>
+# Contributor: Márcio Silva <coadde@lavabit.com>
+
+pkgname=linux-libre-firmware
+pkgver=3.6
+pkgrel=1
+pkgdesc='Free Firmware files for Linux-libre'
+arch=('any')
+url='http://linux-libre.fsfla.org/'
+license=('GPL2')
+provides=('linux-firmware=20120625'
+          'kernel26-firmware=2.6.34.99')
+conflicts=('linux-firmware'
+           'linux-firmware-git'
+           'kernel26-firmware'
+           'ar9170-fw'
+           'iwlwifi-1000-ucode'
+           'iwlwifi-3945-ucode'
+           'iwlwifi-4965-ucode'
+           'iwlwifi-5000-ucode'
+           'iwlwifi-5150-ucode'
+           'iwlwifi-6000-ucode'
+           'rt2870usb-fw'
+           'rt2x00-rt61-fw'
+           'rt2x00-rt71w-fw')
+replaces=('linux-firmware'
+          'kernel26-firmware'
+          'ar9170-fw'
+          'iwlwifi-1000-ucode'
+          'iwlwifi-3945-ucode'
+          'iwlwifi-4965-ucode'
+          'iwlwifi-5000-ucode'
+          'iwlwifi-5150-ucode'
+          'iwlwifi-6000-ucode'
+          'rt2870usb-fw'
+          'rt2x00-rt61-fw'
+          'rt2x00-rt71w-fw')
+source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$pkgver-gnu/linux-libre-$pkgver-gnu.tar.xz")
+md5sums=('a2312edd0265b5b07bd4b50afae2b380')
+
+package() {
+  cd $srcdir/linux-$pkgver
+  
+  make INSTALL_FW_PATH=$pkgdir/usr/lib/firmware firmware_install
+
+  # move WHENCE file to linux-libre-firmware license folder
+  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
+  mv firmware/WHENCE $pkgdir/usr/share/licenses/$pkgname
+}
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 77bc80f7d..4feb1ac6f 100755
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -7,10 +7,10 @@
 pkgbase=linux-libre-lts     # Build stock -LIBRE-LTS kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_sublevel=43
+_sublevel=45
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.43 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.44 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -30,9 +30,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         'c4b4e6d908e70fc6f991a1789a3ac620'
-         '2e7d5f58da4d66e87bbe2c9294c50aef'
-         '77608e2de7b30a08ecd8e422bf2b16bb'
+         '74df2b1ddb4f50eed20df1dbfda040cd'
+         'aed25ab047e1c0b020a1516c235c6a74'
+         '7d37e8ce0f4bd5a957172b12ae742ea0'
          'c072b17032e80debc6a8626299245d46'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
@@ -40,7 +40,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
          'f36222e7ce20c8e4dc27376f9be60f6c'
-         '2c4870ef22f87ef885f3be392d1aaa90')
+         '31878a4cf1dd4083a61982199b4ee650')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -90,7 +90,7 @@ build() {
 # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
 # and make USB storage support builtin (e.g. for booting from USB
 # disks without slowly loading an initramfs)
-    sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+    sed -ri \
         -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
         -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
@@ -154,7 +154,7 @@ build() {
 _package() {
   pkgdesc="The ${pkgbase} kernel and modules - stable longtime supported kernel package suitable for servers"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
-  depends=('coreutils' 'kmod')
+  depends=('coreutils' 'linux-libre-firmware' 'kmod')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
   conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
diff --git a/libre/linux-libre-lts/config.i686 b/libre/linux-libre-lts/config.i686
index 74d543f70..823d65d18 100755
--- a/libre/linux-libre-lts/config.i686
+++ b/libre/linux-libre-lts/config.i686
@@ -5069,7 +5069,7 @@ CONFIG_QUOTA_TREE=m
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_GENERIC_ACL=y
diff --git a/libre/linux-libre-lts/config.x86_64 b/libre/linux-libre-lts/config.x86_64
index e43cc343c..89eed9382 100755
--- a/libre/linux-libre-lts/config.x86_64
+++ b/libre/linux-libre-lts/config.x86_64
@@ -4811,7 +4811,7 @@ CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
 CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_GENERIC_ACL=y
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index d24939c13..843a3ce27 100755
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.43-1-LIBRE-LTS
+KERNEL_VERSION=3.0.45-1-LIBRE-LTS
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index 802800fa0..d3154ac86 100755
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -4,11 +4,11 @@
 
 pkgbase=linux-libre-tools
 pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre')
-_basekernel=3.5
+_basekernel=3.6
 #_sublevel=1
 #pkgver=${_basekernel}.${_sublevel}
 pkgver=${_basekernel}
-pkgrel=5
+pkgrel=1
 license=('GPL2')
 arch=('i686' 'x86_64' 'mips64el')
 url='http://linux-libre.fsfla.org/'
@@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'usbipd.conf'
         'usbipd.rc'
         'usbipd.service')
-md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
-         '18d5aa9e4c6bb23bb02bf65e155e0f0e'
-         '1d9214637968b91706b6e616a100d44b'
+md5sums=('a2312edd0265b5b07bd4b50afae2b380'
+         '56883c159381ba89e50ab8ea65efec77'
+         '5fc1fcda4cef93f16e752b1931db23e3'
          'c0d17b5295fe964623c772a2dd981771'
          '2450e8ff41b30eb58d43b5fffbfde1f4'
          'e8fac9c45a628015644b4150b139278a'
@@ -102,7 +102,7 @@ package_cpupower-libre() {
   pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor'
   backup=('etc/conf.d/cpupower')
   depends=('bash' 'pciutils')
-  replaces=('cpupower')
+  replaces=('cpupower' 'cpufrequtils')
   conflicts=('cpupower' 'cpufrequtils')
   provides=("cpupower=$pkgver")
 
@@ -152,4 +152,4 @@ package_usbip-libre() {
   install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
 }
 
-# vim:set ts=2 sw=2 ft=sh et:
+# vim:set ts=2 sw=2 et:
diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.conf
index f4e9cc4c8..b5c522ea1 100755
--- a/libre/linux-libre-tools/cpupower.conf
+++ b/libre/linux-libre-tools/cpupower.conf
@@ -8,10 +8,11 @@
 #max_freq="3GHz"
 
 # Specific frequency to be set.
-# Requires userspace governor to be available and loaded.
+# Requires userspace governor to be available.
+# Do not set governor field if you use this one.
 #freq=
 
-# Utilizes cores in one processor package/socket first before processes are
+# Utilizes cores in one processor package/socket first before processes are 
 # scheduled to other processor packages/sockets.
 # See man (1) CPUPOWER-SET for additional details.
 #mc_scheduler=
diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc
index 2c4441c4e..88edaf791 100755
--- a/libre/linux-libre-tools/cpupower.rc
+++ b/libre/linux-libre-tools/cpupower.rc
@@ -2,7 +2,6 @@
 
 . /etc/rc.conf
 . /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
 
 case "$1" in
   start|restart)
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 45888f407..61ba504a7 100755
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -9,11 +9,11 @@
 
 pkgbase=linux-libre         # Build stock -LIBRE kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
-_basekernel=3.5
-_sublevel=4
+_basekernel=3.6
+_sublevel=1
 pkgver=${_basekernel}.${_sublevel}
 pkgrel=1
-_lxopkgver=${_basekernel}.4 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.0 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -29,23 +29,17 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'Kbuild.platforms'
         'boot-logo.patch'
         'change-default-console-loglevel.patch'
-        'alsa-powersave-3.5.x.patch'
-        'watchdog-3.5.x.patch'
-        'i915-i2c-crash-3.5.x.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
-md5sums=('2407fc9563a74acaf38aa0c06516eb1c'
-         '51fd8205ef5bcebc8c777a30c57b1fa2'
-         'd83444b46ed5088e47f38cce2641023c'
-         '1ca6f15729d07ae7b3969eea3b4d8cff'
+md5sums=('a2312edd0265b5b07bd4b50afae2b380'
+         '62d272c8ec79bd2eb9cc56001aaf1042'
+         '8262778cb9c808d1c33f3e3c726e48e3'
+         'e0ba119c57f72d467995e8e63a69b2ab'
          'e49ac236dfeef709f91a3d993ea7b62c'
          '2967cecc3af9f954ccc822fd63dca6ff'
          '8267264d9a8966e57fdacd1fa1fc65c4'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         'c1d58e712112cf8f95e7831012a1e67a'
-         'ae13ed1e92bba07e9b17cf5c8d89683c'
-         'ff4a203dd52e4dfb5d60948bb667d06d'
-         'd5c5a9bb87544c9fbc19c661802f9020')
+         '5dd9f2e6717ed2639c1685cffe034b7f')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -65,14 +59,6 @@ build() {
   # Add freedo as boot logo
   patch -Np1 -i "${srcdir}/boot-logo.patch"
 
-  # fix broken watchdog
-  # https://bugzilla.kernel.org/show_bug.cgi?id=44991
-  patch -Np1 -i "${srcdir}/watchdog-3.5.x.patch"
-
-  # fix i915 i2c crash
-  # https://bugzilla.kernel.org/show_bug.cgi?id=46381
-  patch -Np1 -i "${srcdir}/i915-i2c-crash-3.5.x.patch"
-
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
@@ -90,7 +76,7 @@ build() {
 # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
 # and make USB storage support builtin (e.g. for booting from USB
 # disks without slowly loading an initramfs)
-    sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+    sed -ri \
         -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
         -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
@@ -154,7 +140,7 @@ build() {
 _package() {
   pkgdesc="The ${pkgbase} kernel and modules"
   [ "${pkgbase}" = "linux-libre" ] && groups=('base')
-  depends=('coreutils' 'kmod')
+  depends=('coreutils' 'linux-libre-firmware' 'kmod')
   optdepends=('crda: to set the correct wireless channels of your country')
   provides=("kernel26${_kernelname}=${pkgver}" "linux${_kernelname}=${pkgver}")
   conflicts=("kernel26${_kernelname}" "kernel26-libre${_kernelname}" "linux${_kernelname}")
diff --git a/libre/linux-libre/config.i686 b/libre/linux-libre/config.i686
index 64792e25e..e3598a3e0 100755
--- a/libre/linux-libre/config.i686
+++ b/libre/linux-libre/config.i686
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.5.0-2 Kernel Configuration
+# Linux/i386 3.6.0 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -134,10 +134,8 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
-CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
+# CONFIG_MEMCG is not set
+# CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -152,7 +150,6 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
@@ -230,6 +227,7 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
 
@@ -334,7 +332,7 @@ CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_X86_32_IRIS=m
 CONFIG_SCHED_OMIT_FRAME_POINTER=y
 CONFIG_PARAVIRT_GUEST=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y 
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 # CONFIG_XEN_PRIVILEGED_GUEST is not set
 CONFIG_KVM_CLOCK=y
 CONFIG_KVM_GUEST=y
@@ -443,6 +441,7 @@ CONFIG_SPARSEMEM_STATIC=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_COMPACTION=y
@@ -516,7 +515,7 @@ CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_CAN_PM_TRACE=y
+CONFIG_PM_SLEEP_DEBUG=y
 # CONFIG_PM_TRACE_RTC is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
@@ -604,6 +603,7 @@ CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
 #
@@ -747,6 +747,7 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 # CONFIG_ARPD is not set
 CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -838,6 +839,8 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
@@ -1298,6 +1301,7 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1328,7 +1332,6 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1343,6 +1346,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1393,6 +1397,7 @@ CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_CMA is not set
 CONFIG_CONNECTOR=y
@@ -1639,9 +1644,6 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -1683,7 +1685,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1943,7 +1944,6 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -2002,6 +2002,7 @@ CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IEEE802154_FAKELB=m
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_NET_TEAM_MODE_LOADBALANCE=m
@@ -2287,6 +2288,7 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -2440,6 +2442,7 @@ CONFIG_HOSTAP_CS=m
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
 
 #
 # Debugging Options
@@ -2457,9 +2460,6 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_IWM_TRACING=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
@@ -2488,6 +2488,7 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
 CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
@@ -2514,6 +2515,7 @@ CONFIG_WL_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX=m
+CONFIG_WL18XX=m
 CONFIG_WLCORE=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WL12XX_PLATFORM_DATA=y
@@ -2529,8 +2531,6 @@ CONFIG_MWIFIEX_USB=m
 #
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 # CONFIG_WAN is not set
 CONFIG_VMXNET3=m
@@ -2809,11 +2809,13 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WACOM_I2C=m
 CONFIG_TOUCHSCREEN_MAX11801=m
 CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_HTCPEN=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -3041,6 +3043,7 @@ CONFIG_I2C_SCMI=m
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
 #
+CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PCI=m
 CONFIG_I2C_EG20T=m
 # CONFIG_I2C_GPIO is not set
@@ -3115,6 +3118,7 @@ CONFIG_GPIO_ICH=m
 #
 # I2C GPIO expanders:
 #
+CONFIG_GPIO_ARIZONA=m
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
@@ -3125,6 +3129,7 @@ CONFIG_GPIO_ICH=m
 # PCI GPIO expanders:
 #
 CONFIG_GPIO_CS5535=y
+CONFIG_GPIO_AMD8111=m
 # CONFIG_GPIO_LANGWELL is not set
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
@@ -3163,6 +3168,7 @@ CONFIG_BATTERY_OLPC=m
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_AVS=y
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3201,6 +3207,7 @@ CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 # CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_HIH6130=m
 CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
@@ -3384,6 +3391,7 @@ CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
 # CONFIG_BCMA_DEBUG is not set
 
 #
@@ -3400,6 +3408,10 @@ CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 CONFIG_MFD_TPS65217=m
 # CONFIG_MFD_TMIO is not set
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
@@ -3421,22 +3433,28 @@ CONFIG_MEDIA_SUPPORT=m
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
 
 #
-# Multimedia drivers
+# Media drivers
 #
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_RC_CORE=m
-CONFIG_LIRC=m
 CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
@@ -3445,7 +3463,7 @@ CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
 CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
+CONFIG_RC_DEVICES=y
 CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -3456,6 +3474,7 @@ CONFIG_IR_NUVOTON=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_MEDIA_ATTACH=y
@@ -3483,6 +3502,8 @@ CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
 CONFIG_MEDIA_TUNER_TDA18212=m
 CONFIG_MEDIA_TUNER_TUA9001=m
 CONFIG_VIDEO_V4L2=m
@@ -3565,6 +3586,7 @@ CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
 CONFIG_VIDEO_AK881X=m
 
 #
@@ -3603,7 +3625,10 @@ CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_VIVI=m
 CONFIG_V4L_USB_DRIVERS=y
-CONFIG_VIDEO_AU0828=m
+
+#
+# Webcam devices
+#
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
@@ -3653,15 +3678,32 @@ CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_USB_SN9C102=m
+
+#
+# Webcam and/or TV USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
 CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
@@ -3671,14 +3713,6 @@ CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
 CONFIG_V4L_PCI_DRIVERS=y
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT848_DVB=y
@@ -3724,6 +3758,8 @@ CONFIG_I2C_SI470X=m
 CONFIG_USB_MR800=m
 CONFIG_USB_DSBR=m
 CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
 CONFIG_I2C_SI4713=m
 CONFIG_RADIO_SI4713=m
 CONFIG_USB_KEENE=m
@@ -3859,7 +3895,6 @@ CONFIG_DVB_DDBRIDGE=m
 #
 # Supported DVB Frontends
 #
-# CONFIG_DVB_FE_CUSTOMISE is not set
 
 #
 # Multistandard (satellite) frontends
@@ -3926,6 +3961,7 @@ CONFIG_DVB_EC100=m
 CONFIG_DVB_STV0367=m
 CONFIG_DVB_CXD2820R=m
 CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
 
 #
 # DVB-C (cable) frontends
@@ -4029,6 +4065,7 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
@@ -4358,6 +4395,7 @@ CONFIG_AC97_BUS=m
 #
 CONFIG_HID=m
 CONFIG_HIDRAW=y
+CONFIG_UHID=m
 CONFIG_HID_GENERIC=m
 
 #
@@ -4388,6 +4426,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_LOGITECH_FF=y
@@ -4777,13 +4816,16 @@ CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_LM3556=m
 CONFIG_LEDS_OT200=m
+CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4801,6 +4843,7 @@ CONFIG_EDAC=y
 #
 # Reporting subsystems
 #
+CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_MCE_INJ=m
@@ -4918,6 +4961,7 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
+# CONFIG_VFIO is not set
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_RING=y
 
@@ -4948,14 +4992,14 @@ CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
 CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
 CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-CONFIG_COMEDI_MISC_DRIVERS=m
+CONFIG_COMEDI_MISC_DRIVERS=y
 CONFIG_COMEDI_KCOMEDILIB=m
 CONFIG_COMEDI_BOND=m
 CONFIG_COMEDI_TEST=m
 CONFIG_COMEDI_PARPORT=m
 CONFIG_COMEDI_SERIAL2002=m
 CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_ISA_DRIVERS=m
+CONFIG_COMEDI_ISA_DRIVERS=y
 CONFIG_COMEDI_ACL7225B=m
 CONFIG_COMEDI_PCL711=m
 CONFIG_COMEDI_PCL724=m
@@ -5001,7 +5045,7 @@ CONFIG_COMEDI_PCMMIO=m
 CONFIG_COMEDI_PCMUIO=m
 CONFIG_COMEDI_MULTIQ3=m
 CONFIG_COMEDI_POC=m
-CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_PCI_DRIVERS=y
 CONFIG_COMEDI_ADDI_APCI_035=m
 CONFIG_COMEDI_ADDI_APCI_1032=m
 CONFIG_COMEDI_ADDI_APCI_1500=m
@@ -5053,13 +5097,16 @@ CONFIG_COMEDI_NI_6527=m
 CONFIG_COMEDI_NI_65XX=m
 CONFIG_COMEDI_NI_660X=m
 CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
 CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_S626=m
 CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=y
 CONFIG_COMEDI_CB_DAS16_CS=m
 CONFIG_COMEDI_DAS08_CS=m
 CONFIG_COMEDI_NI_DAQ_700_CS=m
@@ -5067,22 +5114,19 @@ CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
 CONFIG_COMEDI_NI_LABPC_CS=m
 CONFIG_COMEDI_NI_MIO_CS=m
 CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_USB_DRIVERS=y
 CONFIG_COMEDI_DT9812=m
 CONFIG_COMEDI_USBDUX=m
 CONFIG_COMEDI_USBDUXFAST=m
 CONFIG_COMEDI_USBDUXSIGMA=m
 CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_FC=m
 CONFIG_COMEDI_AMPLC_DIO200=m
 CONFIG_COMEDI_AMPLC_PC236=m
 CONFIG_COMEDI_AMPLC_PC263=m
 CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_TIO=m
 # CONFIG_FB_OLPC_DCON is not set
 CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
@@ -5195,6 +5239,7 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
 CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
+CONFIG_CSR_WIFI=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5253,6 +5298,7 @@ CONFIG_I8253_LOCK=y
 CONFIG_CLKBLD_I8253=y
 CONFIG_IOMMU_API=y
 CONFIG_IOMMU_SUPPORT=y
+CONFIG_OF_IOMMU=y
 CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
@@ -5273,9 +5319,11 @@ CONFIG_EXTCON=m
 # Extcon Device Drivers
 #
 CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_ARIZONA=m
 CONFIG_MEMORY=y
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
 
 #
 # Firmware Drivers
@@ -5336,7 +5384,7 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
 # CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
 CONFIG_NILFS2_FS=m
 CONFIG_FS_POSIX_ACL=y
-CONFIG_EXPORTFS=m
+CONFIG_EXPORTFS=y
 CONFIG_FILE_LOCKING=y
 CONFIG_FSNOTIFY=y
 CONFIG_DNOTIFY=y
@@ -5351,7 +5399,7 @@ CONFIG_QUOTA_TREE=m
 CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_GENERIC_ACL=y
@@ -5446,6 +5494,8 @@ CONFIG_OMFS_FS=m
 # CONFIG_QNX6FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
@@ -5456,10 +5506,11 @@ CONFIG_EXOFS_FS=m
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
 # CONFIG_NFS_V4_1 is not set
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5637,7 +5688,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_LKDTM=m
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
@@ -5704,6 +5755,7 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_NX_TEST is not set
 CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
 # CONFIG_X86_DECODER_SELFTEST is not set
@@ -5788,6 +5840,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Authenticated Encryption with Associated Data
@@ -5893,6 +5947,7 @@ CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
 CONFIG_VHOST_NET=m
+CONFIG_TCM_VHOST=m
 CONFIG_LGUEST=m
 CONFIG_BINARY_PRINTF=y
 
@@ -5958,6 +6013,7 @@ CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
 CONFIG_CORDIC=m
diff --git a/libre/linux-libre/config.x86_64 b/libre/linux-libre/config.x86_64
index 14112f8c1..3263e4dca 100755
--- a/libre/linux-libre/config.x86_64
+++ b/libre/linux-libre/config.x86_64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.5.4-1 Kernel Configuration
+# Linux/x86_64 3.6.0 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -136,10 +136,8 @@ CONFIG_CPUSETS=y
 CONFIG_PROC_PID_CPUSET=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-# CONFIG_CGROUP_MEM_RES_CTLR_SWAP_ENABLED is not set
-CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
+# CONFIG_MEMCG is not set
+# CONFIG_CGROUP_HUGETLB is not set
 # CONFIG_CGROUP_PERF is not set
 CONFIG_CGROUP_SCHED=y
 CONFIG_FAIR_GROUP_SCHED=y
@@ -154,7 +152,6 @@ CONFIG_IPC_NS=y
 CONFIG_PID_NS=y
 CONFIG_NET_NS=y
 CONFIG_SCHED_AUTOGROUP=y
-CONFIG_MM_OWNER=y
 # CONFIG_SYSFS_DEPRECATED is not set
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
@@ -231,6 +228,7 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
 CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP_FILTER=y
@@ -429,6 +427,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y
 CONFIG_HAVE_MEMBLOCK=y
 CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
 CONFIG_ARCH_DISCARD_MEMBLOCK=y
+CONFIG_MEMORY_ISOLATION=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_SPARSE=y
 CONFIG_MEMORY_HOTREMOVE=y
@@ -505,7 +504,7 @@ CONFIG_PM=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_CAN_PM_TRACE=y
+CONFIG_PM_SLEEP_DEBUG=y
 # CONFIG_PM_TRACE_RTC is not set
 CONFIG_ACPI=y
 CONFIG_ACPI_SLEEP=y
@@ -577,6 +576,7 @@ CONFIG_X86_SPEEDSTEP_LIB=m
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
 CONFIG_INTEL_IDLE=y
 
 #
@@ -712,6 +712,7 @@ CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
 # CONFIG_ARPD is not set
 CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
 CONFIG_INET_AH=m
 CONFIG_INET_ESP=m
 CONFIG_INET_IPCOMP=m
@@ -803,6 +804,8 @@ CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
 CONFIG_NF_CT_NETLINK=m
 CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_QUEUE_CT=y
 CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XTABLES=m
 
@@ -1255,6 +1258,7 @@ CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_HCIUART_BCSP=y
 CONFIG_BT_HCIUART_ATH3K=y
 CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
 CONFIG_BT_HCIBCM203X=m
 CONFIG_BT_HCIBPA10X=m
 CONFIG_BT_HCIBFUSB=m
@@ -1285,7 +1289,6 @@ CONFIG_CFG80211_DEFAULT_PS=y
 # CONFIG_CFG80211_DEBUGFS is not set
 # CONFIG_CFG80211_INTERNAL_REGDB is not set
 CONFIG_CFG80211_WEXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_LIB80211=m
 CONFIG_LIB80211_CRYPT_WEP=m
 CONFIG_LIB80211_CRYPT_CCMP=m
@@ -1300,6 +1303,7 @@ CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
 CONFIG_MAC80211_MESH=y
 CONFIG_MAC80211_LEDS=y
 # CONFIG_MAC80211_DEBUGFS is not set
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_MAC80211_DEBUG_MENU is not set
 CONFIG_WIMAX=m
 CONFIG_WIMAX_DEBUG_LEVEL=8
@@ -1351,6 +1355,7 @@ CONFIG_SYS_HYPERVISOR=y
 # CONFIG_GENERIC_CPU_DEVICES is not set
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=m
+CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_CONNECTOR=y
 CONFIG_PROC_EVENTS=y
@@ -1575,9 +1580,6 @@ CONFIG_EEPROM_93CX6=m
 CONFIG_CB710_CORE=m
 # CONFIG_CB710_DEBUG is not set
 CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_IWMC3200TOP=m
-# CONFIG_IWMC3200TOP_DEBUG is not set
-# CONFIG_IWMC3200TOP_DEBUGFS is not set
 
 #
 # Texas Instruments shared transport line discipline
@@ -1619,7 +1621,6 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_CONSTANTS is not set
 # CONFIG_SCSI_LOGGING is not set
 # CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
 
 #
 # SCSI Transports
@@ -1854,7 +1855,6 @@ CONFIG_DM_CRYPT=m
 CONFIG_DM_SNAPSHOT=m
 CONFIG_DM_THIN_PROVISIONING=m
 # CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
-# CONFIG_DM_DEBUG_SPACE_MAPS is not set
 CONFIG_DM_MIRROR=m
 CONFIG_DM_RAID=m
 CONFIG_DM_LOG_USERSPACE=m
@@ -1914,6 +1914,7 @@ CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IEEE802154_FAKELB=m
 CONFIG_IFB=m
 CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_NET_TEAM_MODE_LOADBALANCE=m
@@ -2170,6 +2171,7 @@ CONFIG_CICADA_PHY=m
 CONFIG_VITESSE_PHY=m
 CONFIG_SMSC_PHY=m
 CONFIG_BROADCOM_PHY=m
+CONFIG_BCM87XX_PHY=m
 CONFIG_ICPLUS_PHY=m
 CONFIG_REALTEK_PHY=m
 CONFIG_NATIONAL_PHY=m
@@ -2321,6 +2323,7 @@ CONFIG_HOSTAP_CS=m
 # CONFIG_IPW2100 is not set
 # CONFIG_IPW2200 is not set
 CONFIG_IWLWIFI=m
+CONFIG_IWLDVM=m
 
 #
 # Debugging Options
@@ -2338,9 +2341,6 @@ CONFIG_IWL3945=m
 # iwl3945 / iwl4965 Debugging Options
 #
 # CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-CONFIG_IWM_TRACING=y
 CONFIG_LIBERTAS=m
 CONFIG_LIBERTAS_USB=m
 CONFIG_LIBERTAS_CS=m
@@ -2369,6 +2369,7 @@ CONFIG_RT2800PCI=m
 CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
 CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
 CONFIG_RT2800USB=m
@@ -2395,6 +2396,7 @@ CONFIG_WL_TI=y
 CONFIG_WL1251=m
 CONFIG_WL1251_SDIO=m
 CONFIG_WL12XX=m
+CONFIG_WL18XX=m
 CONFIG_WLCORE=m
 CONFIG_WLCORE_SDIO=m
 CONFIG_WL12XX_PLATFORM_DATA=y
@@ -2410,8 +2412,6 @@ CONFIG_MWIFIEX_USB=m
 #
 CONFIG_WIMAX_I2400M=m
 CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-# CONFIG_WIMAX_IWMC3200_SDIO is not set
 CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
 # CONFIG_WAN is not set
 CONFIG_XEN_NETDEV_FRONTEND=m
@@ -2671,10 +2671,12 @@ CONFIG_TOUCHSCREEN_WACOM_W8001=m
 CONFIG_TOUCHSCREEN_WACOM_I2C=m
 CONFIG_TOUCHSCREEN_MAX11801=m
 CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
 CONFIG_TOUCHSCREEN_MTOUCH=m
 CONFIG_TOUCHSCREEN_INEXIO=m
 CONFIG_TOUCHSCREEN_MK712=m
 CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
 CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
 CONFIG_TOUCHSCREEN_TOUCHWIN=m
 CONFIG_TOUCHSCREEN_UCB1400=m
@@ -2969,6 +2971,7 @@ CONFIG_GPIO_ICH=m
 #
 # I2C GPIO expanders:
 #
+CONFIG_GPIO_ARIZONA=m
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
@@ -2979,6 +2982,7 @@ CONFIG_GPIO_ICH=m
 # PCI GPIO expanders:
 #
 CONFIG_GPIO_CS5535=m
+CONFIG_GPIO_AMD8111=m
 CONFIG_GPIO_LANGWELL=y
 # CONFIG_GPIO_PCH is not set
 # CONFIG_GPIO_ML_IOH is not set
@@ -3015,6 +3019,7 @@ CONFIG_TEST_POWER=m
 # CONFIG_CHARGER_LP8727 is not set
 # CONFIG_CHARGER_GPIO is not set
 # CONFIG_CHARGER_SMB347 is not set
+CONFIG_POWER_AVS=y
 CONFIG_HWMON=y
 CONFIG_HWMON_VID=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
@@ -3053,6 +3058,7 @@ CONFIG_SENSORS_G760A=m
 CONFIG_SENSORS_GL518SM=m
 CONFIG_SENSORS_GL520SM=m
 # CONFIG_SENSORS_GPIO_FAN is not set
+CONFIG_SENSORS_HIH6130=m
 CONFIG_SENSORS_CORETEMP=m
 CONFIG_SENSORS_IBMAEM=m
 CONFIG_SENSORS_IBMPEX=m
@@ -3229,12 +3235,13 @@ CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
 CONFIG_BCMA_HOST_PCI_POSSIBLE=y
 CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
 # CONFIG_BCMA_DEBUG is not set
 
 #
 # Multifunction device drivers
 #
-CONFIG_MFD_CORE=m
+CONFIG_MFD_CORE=y
 CONFIG_MFD_SM501=m
 CONFIG_MFD_SM501_GPIO=y
 CONFIG_HTC_PASIC3=m
@@ -3245,6 +3252,10 @@ CONFIG_TPS65010=m
 CONFIG_TPS6507X=m
 CONFIG_MFD_TPS65217=m
 # CONFIG_MFD_TMIO is not set
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
 CONFIG_MFD_PCF50633=m
 CONFIG_PCF50633_ADC=m
 CONFIG_PCF50633_GPIO=m
@@ -3266,22 +3277,28 @@ CONFIG_MEDIA_SUPPORT=m
 #
 # Multimedia core support
 #
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
 CONFIG_VIDEO_V4L2_COMMON=m
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
-CONFIG_VIDEO_MEDIA=m
 
 #
-# Multimedia drivers
+# Media drivers
 #
 CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_RC_CORE=m
-CONFIG_LIRC=m
 CONFIG_RC_MAP=m
+CONFIG_RC_DECODERS=y
+CONFIG_LIRC=m
+CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IR_RC5_DECODER=m
 CONFIG_IR_RC6_DECODER=m
@@ -3290,7 +3307,7 @@ CONFIG_IR_SONY_DECODER=m
 CONFIG_IR_RC5_SZ_DECODER=m
 CONFIG_IR_SANYO_DECODER=m
 CONFIG_IR_MCE_KBD_DECODER=m
-CONFIG_IR_LIRC_CODEC=m
+CONFIG_RC_DEVICES=y
 CONFIG_RC_ATI_REMOTE=m
 CONFIG_IR_ENE=m
 CONFIG_IR_IMON=m
@@ -3301,6 +3318,7 @@ CONFIG_IR_NUVOTON=m
 CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGUANA=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_MEDIA_ATTACH=y
@@ -3328,6 +3346,8 @@ CONFIG_MEDIA_TUNER_MC44S803=m
 CONFIG_MEDIA_TUNER_MAX2165=m
 CONFIG_MEDIA_TUNER_TDA18218=m
 CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
 CONFIG_MEDIA_TUNER_TDA18212=m
 CONFIG_MEDIA_TUNER_TUA9001=m
 CONFIG_VIDEO_V4L2=m
@@ -3410,6 +3430,7 @@ CONFIG_VIDEO_SAA7185=m
 CONFIG_VIDEO_ADV7170=m
 CONFIG_VIDEO_ADV7175=m
 CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
 CONFIG_VIDEO_AK881X=m
 
 #
@@ -3448,7 +3469,10 @@ CONFIG_VIDEO_THS7303=m
 CONFIG_VIDEO_M52790=m
 CONFIG_VIDEO_VIVI=m
 CONFIG_V4L_USB_DRIVERS=y
-CONFIG_VIDEO_AU0828=m
+
+#
+# Webcam devices
+#
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
 CONFIG_USB_GSPCA=m
@@ -3498,15 +3522,32 @@ CONFIG_USB_GSPCA_VC032X=m
 CONFIG_USB_GSPCA_VICAM=m
 CONFIG_USB_GSPCA_XIRLINK_CIT=m
 CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_USB_SN9C102=m
+
+#
+# Webcam and/or TV USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_PVRUSB2=m
 CONFIG_VIDEO_PVRUSB2_SYSFS=y
 CONFIG_VIDEO_PVRUSB2_DVB=y
 # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
 CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_EM28XX_RC=m
 CONFIG_VIDEO_TLG2300=m
 CONFIG_VIDEO_CX231XX=m
 CONFIG_VIDEO_CX231XX_RC=y
@@ -3516,14 +3557,6 @@ CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
 CONFIG_VIDEO_USBVISION=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_VIDEO_CPIA2=m
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
 CONFIG_V4L_PCI_DRIVERS=y
 CONFIG_VIDEO_BT848=m
 CONFIG_VIDEO_BT848_DVB=y
@@ -3569,6 +3602,8 @@ CONFIG_I2C_SI470X=m
 CONFIG_USB_MR800=m
 CONFIG_USB_DSBR=m
 CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
 CONFIG_I2C_SI4713=m
 CONFIG_RADIO_SI4713=m
 CONFIG_USB_KEENE=m
@@ -3703,7 +3738,6 @@ CONFIG_DVB_DDBRIDGE=m
 #
 # Supported DVB Frontends
 #
-# CONFIG_DVB_FE_CUSTOMISE is not set
 
 #
 # Multistandard (satellite) frontends
@@ -3770,6 +3804,7 @@ CONFIG_DVB_EC100=m
 CONFIG_DVB_STV0367=m
 CONFIG_DVB_CXD2820R=m
 CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
 
 #
 # DVB-C (cable) frontends
@@ -3867,6 +3902,7 @@ CONFIG_DRM_SIS=m
 CONFIG_DRM_VIA=m
 CONFIG_DRM_SAVAGE=m
 CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
 CONFIG_DRM_GMA500=m
 CONFIG_DRM_GMA600=y
 CONFIG_DRM_GMA3600=y
@@ -4156,6 +4192,7 @@ CONFIG_AC97_BUS=m
 #
 CONFIG_HID=m
 CONFIG_HIDRAW=y
+CONFIG_UHID=m
 CONFIG_HID_GENERIC=m
 
 #
@@ -4186,6 +4223,7 @@ CONFIG_HID_GYRATION=m
 CONFIG_HID_TWINHAN=m
 CONFIG_HID_KENSINGTON=m
 CONFIG_HID_LCPOWER=m
+CONFIG_HID_LENOVO_TPKBD=m
 CONFIG_HID_LOGITECH=m
 CONFIG_HID_LOGITECH_DJ=m
 CONFIG_LOGITECH_FF=y
@@ -4574,13 +4612,16 @@ CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 CONFIG_LEDS_MC13783=m
 CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_LM3556=m
 CONFIG_LEDS_OT200=m
+CONFIG_LEDS_BLINKM=m
 CONFIG_LEDS_TRIGGERS=y
 
 #
 # LED Triggers
 #
 CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
 CONFIG_LEDS_TRIGGER_BACKLIGHT=m
 CONFIG_LEDS_TRIGGER_GPIO=m
@@ -4598,6 +4639,7 @@ CONFIG_EDAC=y
 #
 # Reporting subsystems
 #
+CONFIG_EDAC_LEGACY_SYSFS=y
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_MCE_INJ=m
@@ -4713,6 +4755,7 @@ CONFIG_UIO_AEC=m
 CONFIG_UIO_SERCOS3=m
 CONFIG_UIO_PCI_GENERIC=m
 CONFIG_UIO_NETX=m
+# CONFIG_VFIO is not set
 CONFIG_VIRTIO=m
 CONFIG_VIRTIO_RING=m
 
@@ -4750,6 +4793,7 @@ CONFIG_XEN_TMEM=y
 CONFIG_XEN_PCIDEV_BACKEND=m
 CONFIG_XEN_PRIVCMD=m
 CONFIG_XEN_ACPI_PROCESSOR=m
+# CONFIG_XEN_MCE_LOG is not set
 CONFIG_STAGING=y
 CONFIG_ET131X=m
 CONFIG_SLICOSS=m
@@ -4764,14 +4808,14 @@ CONFIG_COMEDI=m
 # CONFIG_COMEDI_DEBUG is not set
 CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
 CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
-CONFIG_COMEDI_MISC_DRIVERS=m
+CONFIG_COMEDI_MISC_DRIVERS=y
 CONFIG_COMEDI_KCOMEDILIB=m
 CONFIG_COMEDI_BOND=m
 CONFIG_COMEDI_TEST=m
 CONFIG_COMEDI_PARPORT=m
 CONFIG_COMEDI_SERIAL2002=m
 CONFIG_COMEDI_SKEL=m
-CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_PCI_DRIVERS=y
 CONFIG_COMEDI_ADDI_APCI_035=m
 CONFIG_COMEDI_ADDI_APCI_1032=m
 CONFIG_COMEDI_ADDI_APCI_1500=m
@@ -4823,13 +4867,16 @@ CONFIG_COMEDI_NI_6527=m
 CONFIG_COMEDI_NI_65XX=m
 CONFIG_COMEDI_NI_660X=m
 CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_NI_PCIDIO=m
 CONFIG_COMEDI_NI_PCIMIO=m
 CONFIG_COMEDI_RTD520=m
 CONFIG_COMEDI_S526=m
 CONFIG_COMEDI_S626=m
 CONFIG_COMEDI_SSV_DNP=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=y
 CONFIG_COMEDI_CB_DAS16_CS=m
 CONFIG_COMEDI_DAS08_CS=m
 CONFIG_COMEDI_NI_DAQ_700_CS=m
@@ -4837,22 +4884,19 @@ CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
 CONFIG_COMEDI_NI_LABPC_CS=m
 CONFIG_COMEDI_NI_MIO_CS=m
 CONFIG_COMEDI_QUATECH_DAQP_CS=m
-CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_USB_DRIVERS=y
 CONFIG_COMEDI_DT9812=m
 CONFIG_COMEDI_USBDUX=m
 CONFIG_COMEDI_USBDUXFAST=m
 CONFIG_COMEDI_USBDUXSIGMA=m
 CONFIG_COMEDI_VMK80XX=m
-CONFIG_COMEDI_NI_COMMON=m
-CONFIG_COMEDI_MITE=m
-CONFIG_COMEDI_NI_TIO=m
-CONFIG_COMEDI_NI_LABPC=m
 CONFIG_COMEDI_8255=m
 CONFIG_COMEDI_FC=m
 CONFIG_COMEDI_AMPLC_DIO200=m
 CONFIG_COMEDI_AMPLC_PC236=m
 CONFIG_COMEDI_AMPLC_PC263=m
 CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_NI_TIO=m
 CONFIG_ASUS_OLED=m
 # CONFIG_PANEL is not set
 CONFIG_R8187SE=m
@@ -4964,6 +5008,7 @@ CONFIG_WIMAX_GDM72XX_WIMAX2=y
 CONFIG_WIMAX_GDM72XX_USB=y
 # CONFIG_WIMAX_GDM72XX_SDIO is not set
 CONFIG_WIMAX_GDM72XX_USB_PM=y
+CONFIG_CSR_WIFI=m
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -5043,9 +5088,11 @@ CONFIG_EXTCON=m
 # Extcon Device Drivers
 #
 CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_ARIZONA=m
 CONFIG_MEMORY=y
 # CONFIG_IIO is not set
 # CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
 
 #
 # Firmware Drivers
@@ -5122,7 +5169,7 @@ CONFIG_QFMT_V1=m
 CONFIG_QFMT_V2=m
 CONFIG_QUOTACTL=y
 CONFIG_QUOTACTL_COMPAT=y
-CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS4_FS=y
 CONFIG_FUSE_FS=m
 CONFIG_CUSE=m
 CONFIG_GENERIC_ACL=y
@@ -5217,6 +5264,8 @@ CONFIG_OMFS_FS=m
 # CONFIG_QNX6FS_FS is not set
 # CONFIG_ROMFS_FS is not set
 CONFIG_PSTORE=y
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_FTRACE is not set
 CONFIG_PSTORE_RAM=m
 # CONFIG_SYSV_FS is not set
 CONFIG_UFS_FS=m
@@ -5227,10 +5276,11 @@ CONFIG_EXOFS_FS=m
 CONFIG_ORE=m
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
-CONFIG_NFS_V2=y
-CONFIG_NFS_V3=y
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
 # CONFIG_NFS_V4_1 is not set
 CONFIG_NFS_FSCACHE=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
@@ -5407,7 +5457,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
 # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
 CONFIG_LKDTM=m
-CONFIG_CPU_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_LATENCYTOP is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
@@ -5473,6 +5523,7 @@ CONFIG_DEBUG_RODATA=y
 # CONFIG_DEBUG_RODATA_TEST is not set
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 # CONFIG_DEBUG_NX_TEST is not set
+# CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_DEBUG is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_HAVE_MMIOTRACE_SUPPORT=y
@@ -5558,6 +5609,8 @@ CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Authenticated Encryption with Associated Data
@@ -5628,11 +5681,13 @@ CONFIG_CRYPTO_SALSA20_X86_64=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SERPENT=m
 CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
 CONFIG_CRYPTO_TWOFISH_X86_64=m
 CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
 
 #
 # Compression
@@ -5665,6 +5720,7 @@ CONFIG_KVM_INTEL=m
 CONFIG_KVM_AMD=m
 CONFIG_KVM_MMU_AUDIT=y
 CONFIG_VHOST_NET=m
+CONFIG_TCM_VHOST=m
 CONFIG_BINARY_PRINTF=y
 
 #
@@ -5728,6 +5784,7 @@ CONFIG_CHECK_SIGNATURE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
 CONFIG_NLATTR=y
+CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
 CONFIG_LRU_CACHE=m
 CONFIG_AVERAGE=y
 CONFIG_CORDIC=m
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 8b449331b..389ab27c6 100755
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.5.4-1-LIBRE
+KERNEL_VERSION=3.6.1-1-LIBRE
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index bcb82132a..d4d91c412 100755
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -6,32 +6,24 @@ _pkgbase=lirc
 pkgbase=lirc-libre
 pkgname=('lirc-libre' 'lirc-utils-libre')
 pkgver=0.9.0
-pkgrel=27
+pkgrel=31
 epoch=1
-_extramodules=extramodules-3.5-LIBRE
+_extramodules=extramodules-3.6-LIBRE
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.lirc.org/"
 license=('GPL')
 ### NOTICE don't forget to bump version in depends in package_lirc
-makedepends=('help2man' 'linux-libre-headers>=3.5' 'linux-libre-headers<3.6' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
+makedepends=('help2man' 'linux-libre-headers>=3.6' 'linux-libre-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar.bz2
         lirc_wpc8769l.patch
         lircd-handle-large-config.patch
         lirc_atiusb-kfifo.patch
         kernel-2.6.39.patch
-	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd)
-md5sums=('b232aef26f23fe33ea8305d276637086'
-         '1cce37e18e3f6f46044abab29016d18f'
-         'b70cc9640505205446ec47b7d4779f38'
-         '1f8b104a2365d9f93404b143f499059b'
-         '087a7d102e1c96bf1179f38db2b0b237'
-         '8d0e238dc0eda95e340fe570605da492'
-         '85f7fdac55e5256967241864049bf5e9'
-         '3deb02604b37811d41816e9b4385fcc3'
-         '5b1f8c9cd788a39a6283f93302ce5c6e'
-         'f0c0ac930326168035f0c8e24357ae55'
-         '69d099e6deedfa3c1ee2b6e82d9b8bfb')
+	lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd
+	lirc.service lircm.service irexec.service
+	lirc.tmpfiles
+	)
 
 build() {
   _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
@@ -64,7 +56,7 @@ build() {
 
 package_lirc-libre() {
   pkgdesc="Linux-libre Infrared Remote Control kernel modules for stock kernel libre"
-  depends=('lirc-utils-libre' 'linux-libre>=3.4' 'linux-libre<3.5')
+  depends=('lirc-utils-libre' 'linux-libre>=3.6' 'linux-libre<3.7')
   replaces=('lirc' 'lirc+pctv')
   conflicts=('lirc')
   provides=("lirc=$pkgver")
@@ -88,11 +80,16 @@ package_lirc-utils-libre() {
   conflicts=('lirc-utils')
   provides=("lirc-utils=$pkgver")
   backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf')
+  install=lirc-utils.install
 
   cd "${srcdir}/lirc-${pkgver}"
   make DESTDIR="${pkgdir}" install
   install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d"
   cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d"
+  install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service
+  install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service
+  install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service
+  install -D -m644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf
   cp -rp remotes "${pkgdir}/usr/share/lirc"
   chmod -R go-w "${pkgdir}/usr/share/lirc/"
 
@@ -110,3 +107,18 @@ package_lirc-utils-libre() {
   # remove built modules
   rm -r "${pkgdir}/usr/lib/modules"
 }
+md5sums=('b232aef26f23fe33ea8305d276637086'
+         '1cce37e18e3f6f46044abab29016d18f'
+         'b70cc9640505205446ec47b7d4779f38'
+         '1f8b104a2365d9f93404b143f499059b'
+         '087a7d102e1c96bf1179f38db2b0b237'
+         '8d0e238dc0eda95e340fe570605da492'
+         '85f7fdac55e5256967241864049bf5e9'
+         '3deb02604b37811d41816e9b4385fcc3'
+         '5b1f8c9cd788a39a6283f93302ce5c6e'
+         'f0c0ac930326168035f0c8e24357ae55'
+         '69d099e6deedfa3c1ee2b6e82d9b8bfb'
+         'dab8a73bcc5fd5479d8750493d8d97dc'
+         'c2e20fe68b034df752dba2773db16ebe'
+         '07131d117fcfe9dcd50c453c3a5e9531'
+         'febf25c154a7d36f01159e84f26c2d9a')
+\ No newline at end of file
diff --git a/libre/lirc-libre/irexec.service b/libre/lirc-libre/irexec.service
new file mode 100644
index 000000000..5d7915b29
--- /dev/null
+++ b/libre/lirc-libre/irexec.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=IR Exec
+After=lirc.service
+Wants=lirc.service
+
+[Service]
+ExecStart=/usr/bin/irexec --daemon
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/lirc-libre/lirc-utils.install b/libre/lirc-libre/lirc-utils.install
new file mode 100644
index 000000000..293d1ed7c
--- /dev/null
+++ b/libre/lirc-libre/lirc-utils.install
@@ -0,0 +1,7 @@
+post_install() {
+	systemd-tmpfiles --create lirc.conf
+}
+
+post_upgrade() {
+  post_install
+}
diff --git a/libre/lirc-libre/lirc.install b/libre/lirc-libre/lirc.install
index b39282da6..976f5ab8a 100755
--- a/libre/lirc-libre/lirc.install
+++ b/libre/lirc-libre/lirc.install
@@ -1,4 +1,4 @@
-EXTRAMODULES=extramodules-3.5-LIBRE
+EXTRAMODULES=extramodules-3.6-LIBRE
 
 post_install() {
   # updating module dependencies
diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service
new file mode 100644
index 000000000..953601fd3
--- /dev/null
+++ b/libre/lirc-libre/lirc.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Linux Infrared Remote Control
+
+[Service]
+ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd
+ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid
+Type=forking
+PIDFile=/run/lirc/lircd.pid
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/lirc-libre/lirc.tmpfiles b/libre/lirc-libre/lirc.tmpfiles
new file mode 100644
index 000000000..0b80e2e47
--- /dev/null
+++ b/libre/lirc-libre/lirc.tmpfiles
@@ -0,0 +1 @@
+d /run/lirc 0755 root root -
diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service
new file mode 100644
index 000000000..6b258e312
--- /dev/null
+++ b/libre/lirc-libre/lircm.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=LIRC Mouse
+After=lirc.service
+Wants=lirc.service
+
+[Service]
+ExecStart=/usr/sbin/lircmd -u
+Type=forking
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index a360e113e..f418684b5 100755
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,59 +1,48 @@
-# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $
+# $Id: PKGBUILD 166893 2012-09-20 23:56:51Z eric $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: orelien <aurelien.foret@wanadoo.fr>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
+_pkgname=rp-pppoe
 pkgname=rp-pppoe-libre
-pkgver=3.10
-pkgrel=7
+pkgver=3.11
+pkgrel=1
 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed."
 arch=('i686' 'x86_64')
 url="http://www.roaringpenguin.com/pppoe/"
 license=('GPL')
 depends=('ppp>=2.4.5' 'sh' 'net-tools')
+backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq 
+        etc/ppp/pppoe-server-options)
 options=('!makeflags')
-backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options)
-source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz adsl
-        $pkgname.patch)
-install=rp-pppoe.install
 provides=("rp-pppoe=$pkgver")
 replaces=('rp-pppoe')
 conflicts=('rp-pppoe')
+install=rp-pppoe.install
+source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig}
+        adsl adsl.service $pkgname.patch)
+md5sums=('13b5900c56bd602df6cc526e5e520722'
+         '8fc724aa146dba52ef7b3fbe5b8784c6'
+         'adace1ad441aa88dcb3db52fb7f9c97f'
+         'af234125f956f3a356ab0d0fcaa9e8a2'
+         '3c53d550ac408608abb0b6cd6b76b6c2')
 
-mksource() {
-    wget http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz \
-         -O - | tar xzf -
-
-    pushd rp-pppoe-$pkgver >/dev/null
-
-    patch -Np1 -i ../rp-pppoe-libre.patch
-
-    popd >/dev/null
-
-    mv -v rp-pppoe-$pkgver $pkgname-$pkgver
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  
+  ## Adding patch to remove unfree software recommendation (ServPoET)
+  patch -Np1 -i "$srcdir/rp-pppoe-libre.patch"
 
-    tar czvf $pkgname-$pkgver.tar.gz $pkgname-$pkgver/
-}
+  cd ./src
 
-build() {
-  cd $srcdir/$pkgname-$pkgver/src
   ./configure --prefix=/usr --enable-plugin
-  make PLUGIN_DIR="/usr/lib/rp-pppoe"
+  make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver/src
-  make DESTDIR=$pkgdir install
-
-  #moving .so files to /usr/lib according to FS#13876
-  mkdir -p ${pkgdir}/usr/lib/rp-pppoe
-  mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/
-  #not necessary after moving the plugin
-  rm -rf ${pkgdir}/etc/ppp/plugins
-  #changing config to the new path
-  #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf
+  cd "$srcdir/$_pkgname-$pkgver/src"
+  make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install
 
-  install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl
+  install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl"
+  install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service"
 }
-md5sums=('2c4a678fa684269ff4579bb639674198'
-         'adace1ad441aa88dcb3db52fb7f9c97f'
-         '9f0d49c3a550c5ad76bb70d65c9d97b2')
diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service
new file mode 100644
index 000000000..324164943
--- /dev/null
+++ b/libre/rp-pppoe-libre/adsl.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=ADSL Deamon
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/pppoe-start
+ExecStop=/usr/sbin/pppoe-stop
+
+[Install]
+WantedBy=multi-user.target
diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
index 4f2302496..9cf16d7d7 100755..100644
--- a/libre/rp-pppoe-libre/rp-pppoe-libre.patch
+++ b/libre/rp-pppoe-libre/rp-pppoe-libre.patch
@@ -1,7 +1,7 @@
-diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec
---- rp-pppoe-3.10/rp-pppoe.spec	2008-06-30 11:00:41.000000000 -0300
-+++ rp-pppoe-3.10-libre//rp-pppoe.spec	2011-06-05 21:03:06.000000000 -0300
-@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT
+diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec
+--- rp-pppoe-3.11.orig/rp-pppoe.spec	2012-08-17 15:31:25.000000000 -0300
++++ rp-pppoe-3.11/rp-pppoe.spec	2012-10-05 01:42:29.964508454 -0300
+@@ -55,7 +55,7 @@
  
  %files
  %defattr(-,root,root)
@@ -10,9 +10,9 @@ diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec
  %config(noreplace) /etc/ppp/pppoe.conf
  %config(noreplace) /etc/ppp/pppoe-server-options
  %config(noreplace) /etc/ppp/firewall-masq
-diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET
---- rp-pppoe-3.10/SERVPOET	2008-06-30 11:00:41.000000000 -0300
-+++ rp-pppoe-3.10-libre//SERVPOET	1969-12-31 21:00:00.000000000 -0300
+diff -Nur rp-pppoe-3.11.orig/SERVPOET /dev/null
+--- rp-pppoe-3.11.orig/SERVPOET	2012-08-17 15:31:25.000000000 -0300
++++ /dev/null	2012-10-05 01:27:08.580078512 -0300
 @@ -1,18 +0,0 @@
 -# LIC: GPL
 -
@@ -32,10 +32,10 @@ diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET
 -
 ---
 -David F. Skoll <dfs@roaringpenguin.com>
-diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
---- rp-pppoe-3.10/src/Makefile.in	2008-06-30 11:00:42.000000000 -0300
-+++ rp-pppoe-3.10-libre//src/Makefile.in	2011-06-05 21:03:51.000000000 -0300
-@@ -44,9 +44,6 @@ PPPOE_RELAY=@PPPOE_RELAY@
+diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in
+--- rp-pppoe-3.11.orig/src/Makefile.in	2012-08-17 15:31:25.000000000 -0300
++++ rp-pppoe-3.11/src/Makefile.in	2012-10-05 01:46:13.121336619 -0300
+@@ -44,9 +44,6 @@
  PPPOE_PATH=$(sbindir)/pppoe
  PPPD_PATH=@PPPD@
  
@@ -45,7 +45,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
  # Kernel-mode plugin gets installed here.
  PLUGIN_DIR=/etc/ppp/plugins
  PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so
-@@ -151,7 +148,6 @@ install: all
+@@ -152,7 +149,6 @@
  	$(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir)
  	$(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir)
  	$(install) -m 644 ../README $(DESTDIR)$(docdir)
@@ -53,7 +53,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
  	$(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir)
  	-mkdir -p $(DESTDIR)$(mandir)/man8
  	for i in $(TARGETS) ; do \
-@@ -209,25 +205,15 @@ install: all
+@@ -210,25 +206,15 @@
  	@echo ""
  	@echo "Type 'pppoe-setup' to configure the software."
  
@@ -80,7 +80,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
  		cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \
  	done
  	mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui
-@@ -282,10 +268,6 @@ rpms: tgz
+@@ -286,10 +272,6 @@
  		/usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \
  		/usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm
  
@@ -89,9 +89,9 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
 -	cd .. && rpm -ba servpoet.spec
 -
  clean:
- 	rm -f *.o pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~
+ 	rm -f *.o pppoe-relay pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~
  	test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true
-@@ -300,15 +282,13 @@ distclean: clean
+@@ -304,15 +286,13 @@
  update-version:
  	sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
  	sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-$(VERSION).tar.gz+' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec
@@ -104,7 +104,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in
  
  licensed-only:
 -	$(MAKE) -C licensed-only all VERSION=$(VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION)
-+	$(MAKE) -C licensed-only all VERSION=$(VERSION) 
++	$(MAKE) -C licensed-only all VERSION=$(VERSION)
  
  l2tp: libevent/libevent.a
  	$(MAKE) -C l2tp all
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index add9fd496..4c8910c2b 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -11,13 +11,13 @@
 _pkgname=tp_smapi
 pkgname=tp_smapi-libre
 pkgver=0.41
-pkgrel=6
+pkgrel=9
 pkgdesc="Modules for ThinkPad's SMAPI functionality"
 arch=('i686' 'x86_64')
 url='https://github.com/evgeni/tp_smapi'
 license=('GPL')
-depends=('linux-libre>=3.5' 'linux-libre<3.6')
-makedepends=('linux-libre-headers>=3.5' 'linux-libre-headers<3.6')
+depends=('linux-libre>=3.6' 'linux-libre<3.7')
+makedepends=('linux-libre-headers>=3.6' 'linux-libre-headers<3.7')
 replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
diff --git a/libre/tp_smapi-libre/tp_smapi.install b/libre/tp_smapi-libre/tp_smapi.install
index 5fe1bab90..3662e7f34 100644
--- a/libre/tp_smapi-libre/tp_smapi.install
+++ b/libre/tp_smapi-libre/tp_smapi.install
@@ -1,4 +1,4 @@
-extramodules=/usr/lib/modules/extramodules-3.5-ARCH
+extramodules=/usr/lib/modules/extramodules-3.6-ARCH
 
 post_install() {
   depmod -v $(< "$extramodules/version") &>/dev/null
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 0d01ae1e6..f35ba99c9 100755
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -2,17 +2,18 @@
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=vhba-module
 pkgname=vhba-module-libre
 pkgver=20120422
-_extramodules=extramodules-3.5-LIBRE
-pkgrel=9
+_extramodules=extramodules-3.6-LIBRE
+pkgrel=12
 pkgdesc="Kernel libre module that emulates SCSI devices"
 arch=('i686' 'x86_64')
 url="http://cdemu.sourceforge.net/"
 license=('GPL')
-depends=('linux-libre>=3.5' 'linux-libre<3.6')
+depends=('linux-libre>=3.6' 'linux-libre<3.7')
 makedepends=('linux-libre-headers')
 options=(!makeflags)
 install=$_pkgname.install
diff --git a/libre/vhba-module-libre/vhba-module.install b/libre/vhba-module-libre/vhba-module.install
index b2a49a261..8bd740943 100755
--- a/libre/vhba-module-libre/vhba-module.install
+++ b/libre/vhba-module-libre/vhba-module.install
@@ -1,6 +1,6 @@
 _updatemod() {
   echo "  > Updating module dependencies..."
-  EXTRAMODULES='extramodules-3.5-LIBRE'
+  EXTRAMODULES='extramodules-3.6-LIBRE'
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
index 13a37fe88..e5112c8a9 100644
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ b/libre/virtualbox-libre-modules-lts/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=virtualbox-libre-modules-lts
 pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
 pkgver=4.2.0
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -40,7 +40,8 @@ package_virtualbox-libre-host-modules-lts(){
   install=virtualbox-libre-host-modules-lts.install
 
   _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
-  _extraver=extramodules-${_kernver%.*}-LIBRE-LTS
+  #_extraver=extramodules-${_kernver%.*}-LIBRE-LTS
+  _extraver=extramodules-3.0-LIBRE-LTS
 
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
@@ -59,7 +60,8 @@ package_virtualbox-libre-guest-modules-lts(){
   install=virtualbox-libre-guest-modules-lts.install
 
   _kernver=$(expac -Q '%v' linux-libre-lts-headers)-LIBRE-LTS
-  _extraver=extramodules-${_kernver%.*}-LIBRE-LTS
+  #_extraver=extramodules-${_kernver%.*}-LIBRE-LTS
+  _extraver=extramodules-3.0-LIBRE-LTS
 
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 8d3f61b3a..3bd4616eb 100755
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -7,7 +7,7 @@
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
 pkgver=4.2.0
-pkgrel=2
+pkgrel=6
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -32,7 +32,7 @@ build() {
 
 package_virtualbox-libre-host-modules(){
   pkgdesc='Host kernel libre modules for VirtualBox'
-  depends=('linux-libre>=3.5' 'linux-libre<3.6')
+  depends=('linux-libre>=3.6' 'linux-libre<3.7')
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
@@ -51,7 +51,7 @@ package_virtualbox-libre-host-modules(){
 package_virtualbox-libre-guest-modules(){
   pkgdesc='Guest kernel libre modules for VirtualBox'
   license=('GPL')
-  depends=('linux-libre>=3.5' 'linux-libre<3.6')
+  depends=('linux-libre>=3.6' 'linux-libre<3.7')
   provides=("virtualbox-guest-modules=${pkgver}")
   replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
@@ -64,7 +64,7 @@ package_virtualbox-libre-guest-modules(){
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-host-modules.install"
+  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install"
 }
 
 
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index c3419c991..caf59aa13 100755
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.6-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.6-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.6-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 7dbb749d7..8bd1c2022 100755
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -13,7 +13,7 @@ pkgname=('virtualbox-libre'
          'virtualbox-libre-guest-utils'
          'virtualbox-libre-guest-source')
 pkgver=4.2.0
-pkgrel=3
+pkgrel=3.2
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -65,9 +65,6 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
         'os_gnewsense_64.png'
         'os_gnewsense.png'
         'os_gnu_64.png'
-        'os_gnuhurd.png'
-        'os_gnulinux_64.png'
-        'os_gnulinux.png'
         'os_gnu.png'
         'os_musix_64.png'
         'os_musix.png' 
@@ -101,9 +98,6 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
          'a49ed3ab6bd0fb084de0ab3dd97ae93e'
          '6b432b3305ed446125eef052c38355a6'
          'a70022a468bd3e9daf01818d2d74ac3c'
-         '6b432b3305ed446125eef052c38355a6'
-         'a70022a468bd3e9daf01818d2d74ac3c'
-         'a70022a468bd3e9daf01818d2d74ac3c'
          '380eb2ab6cad3da198094585853c129c'
          'a60bb9a98abcc3c34156f9051d00df9a'
          '3a908ef6952bcf987e63ef2fe4e98d24'
@@ -114,7 +108,7 @@ md5sums=('691b4134983ce7d89b9fb683305cb647'
          '4da8eeb2ece7e475fc7a0d1003da26c6'
          '5e4187af59726d71c5be48d0cd816c34'
          '67cc4c8611890038eb3e4114ae899525'
-         '71df5e3eebe07e683782b264dadf65e7')
+         '1ede8951f4bebac3b50a8e0b999aa348')
 
 #_extramodules=extramodules-3.5-LIBRE
 #_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
@@ -139,13 +133,10 @@ build() {
     rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png
 
  ## Adding free distros icons
-    for i in {gnuhurd,dynebolic,venenux,{gnu{,linux},parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
+    for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
       cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
     done
 
- ## Removing non-free OS icons
-    rm -v "./src/VBox/Frontends/VirtualBox/images/os_"{{{arch,turbo}linux,debian,fedora,gentoo,linux{24,26},macosx,mandriva,{free,net,open}bsd,redhat,solaris,opensuse,oracle{,solaris},ubuntu,win{2k{3,8},7,8,vista,xp},xandros}{,_64},dos,jrockitve,l4,linux{,22,_other},netware,qnx,os2{_other,ecs,warp{3,4,45}},win{2k,31,95,98,_other,me,nt4}}.png
-
     cp "$srcdir/LocalConfig.kmk" .
 
     # fake makeself binary to compile without nofatal
@@ -168,7 +159,7 @@ build() {
 }
 
 package_virtualbox-libre() {
-    pkgdesc='Powerful x86 virtualization for enterprise as well as home use (without non-free distros and others OS presets for the VM creation wizard; Oracle VM VirtualBox Extension Pack support removed)'
+    pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
     depends=('virtualbox-libre-host-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl-libre' 'libxmu' 'curl' 'libvncserver' 'libpng')
     optdepends=('qt: VirtualBox GUI support'
                 'vde2: Virtual Distributed Ethernet support'
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index e6c05d8f4..223aeeb16 100755..100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1,425 +1,6 @@
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-08-29 11:13:40.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-09-19 01:30:56.328334913 -0300
-@@ -44,99 +44,111 @@
- 
- static const osTypePattern gs_OSTypePattern[] =
- {
--    /* DOS: */
--    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
-+  
-+    /* Code names for GNU/Linux distributions */
-+    { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
-+    { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
-+    { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" },
-+    { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" },
-+    { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" },
-+    { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
-+    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "GNULinux" },
-+
-+    /* Regular names of GNU/Linux distributions and GNU-Hurd */
-+    { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
-+    { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
-+    { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
-+    { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
-+    { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
-+    { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
-+    { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
-+    { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
-+    { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },
-+    { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" },
-+    { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" },
-+    { QRegExp("Mus", Qt::CaseInsensitive), "Musix" },
-+    { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
-+    { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
-+    { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
-+    { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
-+    { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
-+    { QRegExp("Hu", Qt::CaseInsensitive), "GNUHurd" },
-+    { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("Arc.*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("Arc", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("Deb.*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("Deb", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("Fe.*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("Fe", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("Tur.*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("Tur", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("Ub.*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("Ub", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("Xa.*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("Xa", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "GNULinux_64" },
-+    { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("Knoppix", Qt::CaseInsensitive), "GNULinux" },
-+    { QRegExp("Dsl", Qt::CaseInsensitive), "GNULinux" },
- 
--    /* Windows: */
--    { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
--    { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
--    { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
--    { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
--    { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
--    { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
--    { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
--    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
--    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
--    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
--    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
--    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
--    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
--    { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
--    { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
--    { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
--    { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
--    { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
--    { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
--
--    /* Solaris: */
--    { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
--    { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
--    { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
--    { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
--    { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
--
--    /* OS/2: */
--    { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
--    { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
--    { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
--    { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
--    { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
--
--    /* Code names for Linux distributions: */
--    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
--    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
--    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
--    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)", Qt::CaseInsensitive), "Debian" },
--    { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
--    { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
--
--    /* Regular names of Linux distributions: */
--    { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
--    { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
--    { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
--    { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
--    { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
--    { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
--    { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
--    { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
--    { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
--    { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
--    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
--    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
--    { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
--    { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
--    { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
--    { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
--    { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
--    { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
--    { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
--    { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
--    { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
--    { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
--    { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
--    { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
--    { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
--    { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
--    { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
--    { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
--    { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
--    { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
--    { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
--
--    /* Other: */
--    { QRegExp("L4", Qt::CaseInsensitive), "L4" },
--    { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
--    { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
--    { QRegExp("Op.*B.*64", Qt::CaseInsensitive), "OpenBSD_64" },
--    { QRegExp("Op.*B", Qt::CaseInsensitive), "OpenBSD" },
--    { QRegExp("Ne.*B.*64", Qt::CaseInsensitive), "NetBSD_64" },
--    { QRegExp("Ne.*B", Qt::CaseInsensitive), "NetBSD" },
--    { QRegExp("QN", Qt::CaseInsensitive), "QNX" },
--    { QRegExp("((Mac)|(Tig)|(Leop)|(osx)).*64", Qt::CaseInsensitive), "MacOS_64" },
--    { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
--    { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
--    { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
-+    /* Other */
-     { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("DOS", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Wi.*98", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Wi.*95", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Wi.*Me", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Wi.*3", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Wi", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("So.*11", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("So.*64", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("So", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("L4", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Op.*B.*64", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Op.*B", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Ne.*B.*64", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Ne.*B", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("QN", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("((Mac)|(Tig)|(Leop)|(osx)).*64", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Net", Qt::CaseInsensitive), "Other" },
-+    { QRegExp("Rocki", Qt::CaseInsensitive), "Other" },
- };
- 
- UIWizardNewVMPage1::UIWizardNewVMPage1(const QString &strGroup)
---- VirtualBox-4.1.18.orig/src/VBox/Main/xml/Settings.cpp	2012-07-25 15:14:50.498764160 -0300
-+++ VirtualBox-4.1.18/src/VBox/Main/xml/Settings.cpp		2012-07-25 15:14:50.548761649 -0300
-@@ -3227,40 +3227,18 @@
- } aConvertOSTypes[] =
- {
-     { "unknown", "Other" },
--    { "dos", "DOS" },
--    { "win31", "Windows31" },
--    { "win95", "Windows95" },
--    { "win98", "Windows98" },
--    { "winme", "WindowsMe" },
--    { "winnt4", "WindowsNT4" },
--    { "win2k", "Windows2000" },
--    { "winxp", "WindowsXP" },
--    { "win2k3", "Windows2003" },
--    { "winvista", "WindowsVista" },
--    { "win2k8", "Windows2008" },
--    { "os2warp3", "OS2Warp3" },
--    { "os2warp4", "OS2Warp4" },
--    { "os2warp45", "OS2Warp45" },
--    { "ecs", "OS2eCS" },
--    { "linux22", "Linux22" },
--    { "linux24", "Linux24" },
--    { "linux26", "Linux26" },
--    { "archlinux", "ArchLinux" },
--    { "debian", "Debian" },
--    { "opensuse", "OpenSUSE" },
--    { "fedoracore", "Fedora" },
--    { "gentoo", "Gentoo" },
--    { "mandriva", "Mandriva" },
--    { "redhat", "RedHat" },
--    { "ubuntu", "Ubuntu" },
--    { "xandros", "Xandros" },
--    { "freebsd", "FreeBSD" },
--    { "openbsd", "OpenBSD" },
--    { "netbsd", "NetBSD" },
--    { "netware", "Netware" },
--    { "solaris", "Solaris" },
--    { "opensolaris", "OpenSolaris" },
--    { "l4", "L4" }
-+    { "gnu", "GNU" },
-+    { "gnuhurd", "GNUHurd" },
-+    { "gnulinux", "GNULinux" },
-+    { "parabola", "Parabola" },
-+    { "gnewsense", "gNewSense" },
-+    { "blag", "Blag" },
-+    { "dragora", "Dragora" },
-+    { "ututo", "Ututo" },
-+    { "musix", "Musix" },
-+    { "trisquel", "Trisquel" },
-+    { "dynebolic", "Dynebolic" },
-+    { "venenux", "Venenux" },
- };
- 
- void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)
---- VirtualBox-4.1.18.orig/src/VBox/Main/xml/SettingsConverter.xsl	2012-07-25 15:21:04.553581275 -0300
-+++ VirtualBox-4.1.18/src/VBox/Main/xml/SettingsConverter.xsl		2012-07-25 15:21:04.593579427 -0300
-@@ -729,40 +729,18 @@
-     <xsl:attribute name="OSType">
-       <xsl:choose>
-         <xsl:when test="@OSType='unknown'">Other</xsl:when>
--        <xsl:when test="@OSType='dos'">DOS</xsl:when>
--        <xsl:when test="@OSType='win31'">Windows31</xsl:when>
--        <xsl:when test="@OSType='win95'">Windows95</xsl:when>
--        <xsl:when test="@OSType='win98'">Windows98</xsl:when>
--        <xsl:when test="@OSType='winme'">WindowsMe</xsl:when>
--        <xsl:when test="@OSType='winnt4'">WindowsNT4</xsl:when>
--        <xsl:when test="@OSType='win2k'">Windows2000</xsl:when>
--        <xsl:when test="@OSType='winxp'">WindowsXP</xsl:when>
--        <xsl:when test="@OSType='win2k3'">Windows2003</xsl:when>
--        <xsl:when test="@OSType='winvista'">WindowsVista</xsl:when>
--        <xsl:when test="@OSType='win2k8'">Windows2008</xsl:when>
--        <xsl:when test="@OSType='os2warp3'">OS2Warp3</xsl:when>
--        <xsl:when test="@OSType='os2warp4'">OS2Warp4</xsl:when>
--        <xsl:when test="@OSType='os2warp45'">OS2Warp45</xsl:when>
--        <xsl:when test="@OSType='ecs'">OS2eCS</xsl:when>
--        <xsl:when test="@OSType='linux22'">Linux22</xsl:when>
--        <xsl:when test="@OSType='linux24'">Linux24</xsl:when>
--        <xsl:when test="@OSType='linux26'">Linux26</xsl:when>
--        <xsl:when test="@OSType='archlinux'">ArchLinux</xsl:when>
--        <xsl:when test="@OSType='debian'">Debian</xsl:when>
--        <xsl:when test="@OSType='opensuse'">OpenSUSE</xsl:when>
--        <xsl:when test="@OSType='fedoracore'">Fedora</xsl:when>
--        <xsl:when test="@OSType='gentoo'">Gentoo</xsl:when>
--        <xsl:when test="@OSType='mandriva'">Mandriva</xsl:when>
--        <xsl:when test="@OSType='redhat'">RedHat</xsl:when>
--        <xsl:when test="@OSType='ubuntu'">Ubuntu</xsl:when>
--        <xsl:when test="@OSType='xandros'">Xandros</xsl:when>
--        <xsl:when test="@OSType='freebsd'">FreeBSD</xsl:when>
--        <xsl:when test="@OSType='openbsd'">OpenBSD</xsl:when>
--        <xsl:when test="@OSType='netbsd'">NetBSD</xsl:when>
--        <xsl:when test="@OSType='netware'">Netware</xsl:when>
--        <xsl:when test="@OSType='solaris'">Solaris</xsl:when>
--        <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when>
--        <xsl:when test="@OSType='l4'">L4</xsl:when>
-+        <xsl:when test="@OSType='gnu'">GNU</xsl:when>
-+        <xsl:when test="@OSType='gnuhurd'">GNUHurd</xsl:when>
-+        <xsl:when test="@OSType='gnulinux'">GNULinux</xsl:when>
-+        <xsl:when test="@OSType='parabola'">Parabola</xsl:when>
-+        <xsl:when test="@OSType='gnewsense'">gNewSense</xsl:when>
-+        <xsl:when test="@OSType='blag'">Blag</xsl:when>
-+        <xsl:when test="@OSType='dragora'">Dragora</xsl:when>
-+        <xsl:when test="@OSType='ututo'">Ututo</xsl:when>
-+        <xsl:when test="@OSType='musix'">Musix</xsl:when>
-+        <xsl:when test="@OSType='trisquel'">Trisquel</xsl:when>
-+        <xsl:when test="@OSType='dynebolic'">Dynebolic</xsl:when>
-+        <xsl:when test="@OSType='venenux'">Venenux</xsl:when>
-       </xsl:choose>
-     </xsl:attribute>
-     <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/>
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-09-19 01:52:44.572133271 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-09-19 01:58:47.789130085 -0300
-@@ -1,75 +1,27 @@
- <RCC>
-     <qresource prefix="/">
--        <file alias="os_archlinux.png">images/os_archlinux.png</file>
--        <file alias="os_archlinux_64.png">images/os_archlinux_64.png</file>
--        <file alias="os_debian.png">images/os_debian.png</file>
--        <file alias="os_debian_64.png">images/os_debian_64.png</file>
--        <file alias="os_dos.png">images/os_dos.png</file>
--        <file alias="os_fedora.png">images/os_fedora.png</file>
--        <file alias="os_fedora_64.png">images/os_fedora_64.png</file>
--        <file alias="os_freebsd.png">images/os_freebsd.png</file>
--        <file alias="os_freebsd_64.png">images/os_freebsd_64.png</file>
--        <file alias="os_gentoo.png">images/os_gentoo.png</file>
--        <file alias="os_gentoo_64.png">images/os_gentoo_64.png</file>
--        <file alias="os_jrockitve.png">images/os_jrockitve.png</file>
--        <file alias="os_l4.png">images/os_l4.png</file>
--        <file alias="os_linux_other.png">images/os_linux_other.png</file>
--        <file alias="os_linux22.png">images/os_linux22.png</file>
--        <file alias="os_linux24.png">images/os_linux24.png</file>
--        <file alias="os_linux24_64.png">images/os_linux24_64.png</file>
--        <file alias="os_linux26.png">images/os_linux26.png</file>
--        <file alias="os_linux26_64.png">images/os_linux26_64.png</file>
--        <file alias="os_mandriva.png">images/os_mandriva.png</file>
--        <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
--        <file alias="os_netbsd.png">images/os_netbsd.png</file>
--        <file alias="os_netbsd_64.png">images/os_netbsd_64.png</file>
--        <file alias="os_netware.png">images/os_netware.png</file>
--        <file alias="os_openbsd.png">images/os_openbsd.png</file>
--        <file alias="os_openbsd_64.png">images/os_openbsd_64.png</file>
--        <file alias="os_oraclesolaris.png">images/os_oraclesolaris.png</file>
--        <file alias="os_oraclesolaris_64.png">images/os_oraclesolaris_64.png</file>
--        <file alias="os_opensuse.png">images/os_opensuse.png</file>
--        <file alias="os_opensuse_64.png">images/os_opensuse_64.png</file>
--        <file alias="os_os2_other.png">images/os_os2_other.png</file>
--        <file alias="os_os2ecs.png">images/os_os2ecs.png</file>
--        <file alias="os_os2warp3.png">images/os_os2warp3.png</file>
--        <file alias="os_os2warp4.png">images/os_os2warp4.png</file>
--        <file alias="os_os2warp45.png">images/os_os2warp45.png</file>
-         <file alias="os_other.png">images/os_other.png</file>
--        <file alias="os_qnx.png">images/os_qnx.png</file>
--        <file alias="os_redhat.png">images/os_redhat.png</file>
--        <file alias="os_redhat_64.png">images/os_redhat_64.png</file>
--        <file alias="os_turbolinux.png">images/os_turbolinux.png</file>
--        <file alias="os_turbolinux_64.png">images/os_turbolinux_64.png</file>
--        <file alias="os_solaris.png">images/os_solaris.png</file>
--        <file alias="os_solaris_64.png">images/os_solaris_64.png</file>
--        <file alias="os_ubuntu.png">images/os_ubuntu.png</file>
--        <file alias="os_ubuntu_64.png">images/os_ubuntu_64.png</file>
--        <file alias="os_win_other.png">images/os_win_other.png</file>
--        <file alias="os_win2k.png">images/os_win2k.png</file>
--        <file alias="os_win2k3.png">images/os_win2k3.png</file>
--        <file alias="os_win2k3_64.png">images/os_win2k3_64.png</file>
--        <file alias="os_win2k8.png">images/os_win2k8.png</file>
--        <file alias="os_win2k8_64.png">images/os_win2k8_64.png</file>
--        <file alias="os_win31.png">images/os_win31.png</file>
--        <file alias="os_win7.png">images/os_win7.png</file>
--        <file alias="os_win7_64.png">images/os_win7_64.png</file>
--        <file alias="os_win8.png">images/os_win8.png</file>
--        <file alias="os_win8_64.png">images/os_win8_64.png</file>
--        <file alias="os_win95.png">images/os_win95.png</file>
--        <file alias="os_win98.png">images/os_win98.png</file>
--        <file alias="os_winme.png">images/os_winme.png</file>
--        <file alias="os_winnt4.png">images/os_winnt4.png</file>
--        <file alias="os_winvista.png">images/os_winvista.png</file>
--        <file alias="os_winvista_64.png">images/os_winvista_64.png</file>
--        <file alias="os_winxp.png">images/os_winxp.png</file>
--        <file alias="os_winxp_64.png">images/os_winxp_64.png</file>
--        <file alias="os_xandros.png">images/os_xandros.png</file>
--        <file alias="os_xandros_64.png">images/os_xandros_64.png</file>
--        <file alias="os_oracle.png">images/os_oracle.png</file>
--        <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
--        <file alias="os_macosx.png">images/os_macosx.png</file>
--        <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
-+        <file alias="os_parabola.png">images/os_parabola.png</file>
-+        <file alias="os_parabola_64.png">images/os_parabola_64.png</file>
-+        <file alias="os_gnewsense.png">images/os_gnewsense.png</file>
-+        <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file>
-+        <file alias="os_blag.png">images/os_blag.png</file>
-+        <file alias="os_blag_64.png">images/os_blag_64.png</file>
-+        <file alias="os_ututo.png">images/os_ututo.png</file>
-+        <file alias="os_ututo_64.png">images/os_ututo_64.png</file>
-+        <file alias="os_gnu.png">images/os_gnu.png</file>
-+        <file alias="os_gnu_64.png">images/os_gnu_64.png</file>
-+        <file alias="os_gnuhurd.png">images/os_gnuhurd.png</file>
-+        <file alias="os_gnulinux.png">images/os_gnulinux.png</file>
-+        <file alias="os_gnulinux_64.png">images/os_gnulinux_64.png</file>
-+        <file alias="os_musix.png">images/os_musix.png</file>
-+        <file alias="os_musix_64.png">images/os_musix_64.png</file>
-+        <file alias="os_dragora.png">images/os_dragora.png</file>
-+        <file alias="os_dragora_64.png">images/os_dragora_64.png</file>
-+        <file alias="os_dynebolic.png">images/os_dynebolic.png</file>
-+        <file alias="os_venenux.png">images/os_venenux.png</file>
-+        <file alias="os_trisquel.png">images/os_trisquel.png</file>
-+        <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file>
-         <file alias="hd_16px.png">images/hd_16px.png</file>
-         <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
-         <file alias="hd_32px.png">images/hd_32px.png</file>
 --- VirtualBox-4.2.0.orig/src/VBox/Main/src-all/Global.cpp	2012-09-08 06:36:02.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp		2012-09-19 03:33:50.143066084 -0300
-@@ -29,296 +29,94 @@
-     /* NOTE1: we assume that unknown is always the first entry!
-      * NOTE2: please use powers of 2 when specifying the size of harddisks since
-      *        '2GB' looks better than '1.95GB' (= 2000MB) */
--    { "Other",   "Other",             "Other",              "Other/Unknown",
-+    { "Other",     "Other",           "Other",              "Other/Unknown",
++++ VirtualBox-4.2.0/src/VBox/Main/src-all/Global.cpp	2012-10-03 15:38:41.975881316 -0300
+@@ -33,289 +33,365 @@
        VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
          64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
@@ -504,16 +85,6 @@
 -       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 -        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Linux22",            "Linux 2.2",
--      VBOXOSTYPE_Linux22,         VBOXOSHINT_RTCUTC,
--        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux24",            "Linux 2.4",
--      VBOXOSTYPE_Linux24,         VBOXOSHINT_RTCUTC,
--       128,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux24_64",         "Linux 2.4 (64 bit)",
--      VBOXOSTYPE_Linux24_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
--       128,   4,  4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
 +    { "GNU",       "GNU",             "GNU",                "GNU",
 +      VBOXOSTYPE_GNU,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -525,326 +96,664 @@
 +    { "GNU-Hurd",  "GNU-Hurd",        "GNUHurd",            "GNU-Hurd",
 +      VBOXOSTYPE_GNUHurd,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 +       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "GNU/Linux",   "GNU/Linux",             "Linux22",            "GNU/Linux with kernel v2.2",
+       VBOXOSTYPE_Linux22,         VBOXOSHINT_RTCUTC,
+         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
+-    { "Linux",   "Linux",             "Linux24",            "Linux 2.4",
++    { "GNU/Linux",   "GNU/Linux",             "Linux24",            "GNU/Linux with kernel v2.4",
+       VBOXOSTYPE_Linux24,         VBOXOSHINT_RTCUTC,
+        128,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
+-    { "Linux",   "Linux",             "Linux24_64",         "Linux 2.4 (64 bit)",
++    { "GNU/Linux",   "GNU/Linux",             "Linux24_64",         "GNU/Linux with kernel v2.4 (64 bit)",
+       VBOXOSTYPE_Linux24_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+        128,   4,  4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Linux26",            "Linux 2.6",
--      VBOXOSTYPE_Linux26,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "GNULinux",           "GNU/Linux",
-+      VBOXOSTYPE_GNULinux,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "GNU/Linux",   "GNU/Linux",             "Linux26",            "GNU/Linux with kernel v2.6",
+       VBOXOSTYPE_Linux26,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Linux26_64",         "Linux 2.6 (64 bit)",
--      VBOXOSTYPE_Linux26_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "GNULinux_64",        "GNU/Linux (64 bit)",
-+      VBOXOSTYPE_GNULinux_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "GNU/Linux",   "GNU/Linux",             "Linux26_64",         "GNU/Linux with kernel v2.6 (64 bit)",
+       VBOXOSTYPE_Linux26_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "ArchLinux",          "Arch Linux",
--      VBOXOSTYPE_ArchLinux,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "Parabola",           "Parabola GNU/Linux-libre",
++    { "GNU/Linux",   "GNU/Linux",             "Linux",              "Other GNU/Linux",
++      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Parabola",           "Parabola GNU/Linux-libre",
 +      VBOXOSTYPE_Parabola,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Parabola_64",        "Parabola GNU/Linux-libre (64 bit)",
++      VBOXOSTYPE_Parabola_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "gNewSense",          "gNewSense",
++      VBOXOSTYPE_gNewSense,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "gNewSense_64",       "gNewSense (64 bit)",
++      VBOXOSTYPE_gNewSense_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
++    { "Free Distros", "Free GNU/Linux Distros",       "Blag",               "Blag Linux and GNU",
++      VBOXOSTYPE_Blag,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Blag_64",            "Blag Linux and GNU (64 bit)",
++      VBOXOSTYPE_Blag_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Dragora",            "Dragora",
++      VBOXOSTYPE_Dragora,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Dragora_64",         "Dragora (64 bit)",
++      VBOXOSTYPE_Dragora_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Ututo",              "Ututo XS",
++      VBOXOSTYPE_Ututo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Ututo_64",           "Ututo XS (64 bit)",
++      VBOXOSTYPE_Ututo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Musix",              "Musix",
++      VBOXOSTYPE_Musix,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Musix_64",           "Musix (64 bit)",
++      VBOXOSTYPE_Musix_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
++    { "Free Distros", "Free GNU/Linux Distros",       "Trisquel",           "Trisquel",
++      VBOXOSTYPE_Trisquel,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
++       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Trisquel_64",        "Trisquel (64 bit)",
++      VBOXOSTYPE_Trisquel_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Dynebolic",          "Dyne:bolic",
++      VBOXOSTYPE_Dynebolic,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Free Distros", "Free GNU/Linux Distros",       "Venenux",            "Venenux",
++      VBOXOSTYPE_Venenux,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux",          "Arch Linux",
+       VBOXOSTYPE_ArchLinux,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "ArchLinux_64",       "Arch Linux (64 bit)",
--      VBOXOSTYPE_ArchLinux_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "Parabola_64",        "Parabola GNU/Linux-libre (64 bit)",
-+      VBOXOSTYPE_Parabola_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux_64",       "Arch Linux (64 bit)",
+       VBOXOSTYPE_ArchLinux_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Debian",             "Debian",
--      VBOXOSTYPE_Debian,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "gNewSense",          "gNewSense",
-+      VBOXOSTYPE_gNewSense,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian",             "Debian",
+       VBOXOSTYPE_Debian,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Debian_64",          "Debian (64 bit)",
--      VBOXOSTYPE_Debian_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "gNewSense_64",       "gNewSense (64 bit)",
-+      VBOXOSTYPE_gNewSense_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian_64",          "Debian (64 bit)",
+       VBOXOSTYPE_Debian_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
 -    { "Linux",   "Linux",             "OpenSUSE",           "openSUSE",
--      VBOXOSTYPE_OpenSUSE,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
--       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE",           "openSUSE",
+       VBOXOSTYPE_OpenSUSE,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "OpenSUSE_64",        "openSUSE (64 bit)",
--      VBOXOSTYPE_OpenSUSE_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
--       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE_64",        "openSUSE (64 bit)",
+       VBOXOSTYPE_OpenSUSE_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Fedora",             "Fedora",
--      VBOXOSTYPE_FedoraCore,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "Blag",               "Blag Linux and GNU",
-+      VBOXOSTYPE_Blag,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora",             "Fedora",
+       VBOXOSTYPE_FedoraCore,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Fedora_64",          "Fedora (64 bit)",
--      VBOXOSTYPE_FedoraCore_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "Blag_64",            "Blag Linux and GNU (64 bit)",
-+      VBOXOSTYPE_Blag_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora_64",          "Fedora (64 bit)",
+       VBOXOSTYPE_FedoraCore_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Gentoo",             "Gentoo",
--      VBOXOSTYPE_Gentoo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "Dragora",            "Dragora",
-+      VBOXOSTYPE_Dragora,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo",             "Gentoo",
+       VBOXOSTYPE_Gentoo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Gentoo_64",          "Gentoo (64 bit)",
--      VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "Dragora_64",         "Dragora (64 bit)",
-+      VBOXOSTYPE_Dragora_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo_64",          "Gentoo (64 bit)",
+       VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Mandriva",           "Mandriva",
--      VBOXOSTYPE_Mandriva,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
--       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva",           "Mandriva",
+       VBOXOSTYPE_Mandriva,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Mandriva_64",        "Mandriva (64 bit)",
--      VBOXOSTYPE_Mandriva_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
--       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva_64",        "Mandriva (64 bit)",
+       VBOXOSTYPE_Mandriva_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "RedHat",             "Red Hat",
--      VBOXOSTYPE_RedHat,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
--       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "GNU/Linux", "GNU/Linux",       "Ututo",              "Ututo XS",
-+      VBOXOSTYPE_Ututo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat",             "Red Hat",
+       VBOXOSTYPE_RedHat,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
+        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "RedHat_64",          "Red Hat (64 bit)",
--      VBOXOSTYPE_RedHat_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
--       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "GNU/Linux", "GNU/Linux",       "Ututo_64",           "Ututo XS (64 bit)",
-+      VBOXOSTYPE_Ututo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat_64",          "Red Hat (64 bit)",
+       VBOXOSTYPE_RedHat_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Turbolinux",         "Turbolinux",
--      VBOXOSTYPE_Turbolinux,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "Musix",              "Musix",
-+      VBOXOSTYPE_Musix,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux",         "Turbolinux",
+       VBOXOSTYPE_Turbolinux,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Turbolinux_64",      "Turbolinux (64 bit)",
--      VBOXOSTYPE_Turbolinux_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "Musix_64",           "Musix (64 bit)",
-+      VBOXOSTYPE_Musix_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux_64",      "Turbolinux (64 bit)",
+       VBOXOSTYPE_Turbolinux_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Ubuntu",             "Ubuntu",
--      VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
-+    { "GNU/Linux", "GNU/Linux",       "Trisquel",           "Trisquel",
-+      VBOXOSTYPE_Trisquel,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu",             "Ubuntu",
+       VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Ubuntu_64",          "Ubuntu (64 bit)",
--      VBOXOSTYPE_Ubuntu_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+    { "GNU/Linux", "GNU/Linux",       "Trisquel_64",        "Trisquel (64 bit)",
-+      VBOXOSTYPE_Trisquel_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu_64",          "Ubuntu (64 bit)",
+       VBOXOSTYPE_Ubuntu_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
         512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Xandros",            "Xandros",
--      VBOXOSTYPE_Xandros,         VBOXOSHINT_RTCUTC,
--       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "GNU/Linux", "GNU/Linux",       "Dynebolic",          "Dyne:bolic",
-+      VBOXOSTYPE_Dynebolic,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros",            "Xandros",
+       VBOXOSTYPE_Xandros,         VBOXOSHINT_RTCUTC,
+        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Xandros_64",         "Xandros (64 bit)",
--      VBOXOSTYPE_Xandros_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
--       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "GNU/Linux", "GNU/Linux",       "Venenux",            "Venenux",
-+      VBOXOSTYPE_Venenux,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros_64",         "Xandros (64 bit)",
+       VBOXOSTYPE_Xandros_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
          StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Oracle",             "Oracle",
--      VBOXOSTYPE_Oracle,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
--       512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle",             "Oracle",
+       VBOXOSTYPE_Oracle,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
+        512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Oracle_64",          "Oracle (64 bit)",
--      VBOXOSTYPE_Oracle_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
--       512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle_64",          "Oracle (64 bit)",
+       VBOXOSTYPE_Oracle_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
+        512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Linux",   "Linux",             "Linux",              "Other Linux",
 -      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
 -       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows31",          "Windows 3.1",
++      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
++        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows95",          "Windows 95",
++      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
++        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows98",          "Windows 98",
++      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
++        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsMe",          "Windows ME",
++      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
++        128,  4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4",         "Windows NT 4",
++      VBOXOSTYPE_WinNT4,          VBOXOSHINT_NONE,
++       128,  16,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2000",        "Windows 2000",
++      VBOXOSTYPE_Win2k,            VBOXOSHINT_USBTABLET,
++       168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP",          "Windows XP",
++      VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
++       192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64",       "Windows XP (64 bit)",
++      VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
++       192,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2003",        "Windows 2003",
++      VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
++       256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64",     "Windows 2003 (64 bit)",
++      VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
++       256,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista",       "Windows Vista",
++      VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
++       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64",    "Windows Vista (64 bit)",
++      VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
++       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2008",        "Windows 2008",
++      VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
++       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64",     "Windows 2008 (64 bit)",
++      VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
++       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows7",           "Windows 7",
++      VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
++       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows7_64",        "Windows 7 (64 bit)",
++      VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
++       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows8",           "Windows 8",
++      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
++       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows8_64",        "Windows 8 (64 bit)",
++      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
++       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64",     "Windows 2012 (64 bit)",
++      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
++       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
++    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT",          "Other Windows",
++      VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
++       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
--      VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
--       768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
+       VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
+        768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
--      VBOXOSTYPE_Solaris_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
--      1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
+       VBOXOSTYPE_Solaris_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
+       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
--      VBOXOSTYPE_OpenSolaris,     VBOXOSHINT_USBTABLET,
--       768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
+       VBOXOSTYPE_OpenSolaris,     VBOXOSHINT_USBTABLET,
+        768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
--      VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--      1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
+       VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Solaris", "Solaris",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
--      VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--      1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs", "Non-free Operating Systems",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
+       VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
+       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
+         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "FreeBSD",            "FreeBSD",
--      VBOXOSTYPE_FreeBSD,         VBOXOSHINT_NONE,
--       128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",     "Non-free Operating Systems",               "FreeBSD",            "FreeBSD",
+       VBOXOSTYPE_FreeBSD,         VBOXOSHINT_NONE,
+        128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "FreeBSD_64",         "FreeBSD (64 bit)",
--      VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
--       128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",     "Non-free Operating Systems",               "FreeBSD_64",         "FreeBSD (64 bit)",
+       VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
+        128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "OpenBSD",            "OpenBSD",
--      VBOXOSTYPE_OpenBSD,         VBOXOSHINT_HWVIRTEX,
--        64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",     "Non-free Operating Systems",               "OpenBSD",            "OpenBSD",
+       VBOXOSTYPE_OpenBSD,         VBOXOSHINT_HWVIRTEX,
+         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "OpenBSD_64",         "OpenBSD (64 bit)",
--      VBOXOSTYPE_OpenBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
--        64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",     "Non-free Operating Systems",               "OpenBSD_64",         "OpenBSD (64 bit)",
+       VBOXOSTYPE_OpenBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
+         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "NetBSD",             "NetBSD",
--      VBOXOSTYPE_NetBSD,          VBOXOSHINT_NONE,
--        64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",     "Non-free Operating Systems",               "NetBSD",             "NetBSD",
+       VBOXOSTYPE_NetBSD,          VBOXOSHINT_NONE,
+         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "BSD",     "BSD",               "NetBSD_64",          "NetBSD (64 bit)",
--      VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
--        64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",     "Non-free Operating Systems",               "NetBSD_64",          "NetBSD (64 bit)",
+       VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
+         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "OS2",     "IBM OS/2",          "OS2Warp3",           "OS/2 Warp 3",
--      VBOXOSTYPE_OS2Warp3,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
--        48,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
++    { "Non-free OSs",     "Non-free Operating Systems",          "OS2Warp3",           "OS/2 Warp 3",
+       VBOXOSTYPE_OS2Warp3,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
+         48,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "OS2",     "IBM OS/2",          "OS2Warp4",           "OS/2 Warp 4",
--      VBOXOSTYPE_OS2Warp4,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
--        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
++    { "Non-free OSs",     "Non-free Operating Systems",          "OS2Warp4",           "OS/2 Warp 4",
+       VBOXOSTYPE_OS2Warp4,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
+         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "OS2",     "IBM OS/2",          "OS2Warp45",          "OS/2 Warp 4.5",
--      VBOXOSTYPE_OS2Warp45,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
--        128,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
++    { "Non-free OSs",     "Non-free Operating Systems",          "OS2Warp45",          "OS/2 Warp 4.5",
+       VBOXOSTYPE_OS2Warp45,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
+         128,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "OS2",     "IBM OS/2",          "OS2eCS",             "eComStation",
--      VBOXOSTYPE_ECS,             VBOXOSHINT_HWVIRTEX,
--        256,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",     "Non-free Operating Systems",          "OS2eCS",             "eComStation",
+       VBOXOSTYPE_ECS,             VBOXOSHINT_HWVIRTEX,
+         256,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "OS2",     "IBM OS/2",          "OS2",                "Other OS/2",
--      VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
--        96,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
++    { "Non-free OSs",     "Non-free Operating Systems",          "OS2",                "Other OS/2",
+       VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
+         96,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "MacOS",   "Mac OS X",          "MacOS",              "Mac OS X",
--      VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
--      2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
--       StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
--      ChipsetType_ICH9, AudioControllerType_HDA  },
++    { "Non-free OSs",   "Non-free Operating Systems",          "MacOS",              "Mac OS X",
+       VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
+       2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
+        StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
+       ChipsetType_ICH9, AudioControllerType_HDA  },
 -    { "MacOS",   "Mac OS X",          "MacOS_64",           "Mac OS X (64 bit)",
--      VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
--      2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
--      StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
--      ChipsetType_ICH9, AudioControllerType_HDA  },
++    { "Non-free OSs",   "Non-free Operating Systems",          "MacOS_64",           "Mac OS X (64 bit)",
+       VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
+       2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
+       StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
+       ChipsetType_ICH9, AudioControllerType_HDA  },
 -    { "Other",   "Other",             "DOS",                "DOS",
--      VBOXOSTYPE_DOS,             VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
--        32,   4,  500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
++    { "Non-free OSs",   "Non-free Operating Systems",             "DOS",                "DOS",
+       VBOXOSTYPE_DOS,             VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
+         32,   4,  500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
 -    { "Other",   "Other",             "Netware",            "Netware",
--      VBOXOSTYPE_Netware,         VBOXOSHINT_HWVIRTEX,
--       512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",   "Non-free Operating Systems",             "Netware",            "Netware",
+       VBOXOSTYPE_Netware,         VBOXOSHINT_HWVIRTEX,
+        512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Other",   "Other",             "L4",                 "L4",
--      VBOXOSTYPE_L4,              VBOXOSHINT_NONE,
--        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",   "Non-free Operating Systems",             "L4",                 "L4",
+       VBOXOSTYPE_L4,              VBOXOSHINT_NONE,
+         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Other",   "Other",             "QNX",                "QNX",
--      VBOXOSTYPE_QNX,             VBOXOSHINT_HWVIRTEX,
--       512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--      StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",   "Non-free Operating Systems",             "QNX",                "QNX",
+       VBOXOSTYPE_QNX,             VBOXOSHINT_HWVIRTEX,
+        512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
 -    { "Other",   "Other",             "JRockitVE",          "JRockitVE",
--        VBOXOSTYPE_JRockitVE,     VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
--        1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
++    { "Non-free OSs",   "Non-free Operating Systems",             "JRockitVE",          "JRockitVE",
+         VBOXOSTYPE_JRockitVE,     VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
+         1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+         StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-08-29 11:13:40.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	2012-10-04 01:54:14.693582889 -0300
+@@ -44,45 +44,45 @@
+ 
+ static const osTypePattern gs_OSTypePattern[] =
+ {
+-    /* DOS: */
+-    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
+-
+-    /* Windows: */
+-    { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
+-    { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
+-    { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
+-    { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
+-    { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
+-    { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
+-    { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
+-    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
+-    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
+-    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
+-    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
+-    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
+-    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
+-    { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
+-    { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
+-    { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
+-    { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
+-    { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
+-    { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
+-
+-    /* Solaris: */
+-    { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
+-    { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
+-    { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
+-    { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
+-    { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
+-
+-    /* OS/2: */
+-    { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
+-    { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
+-    { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
+-    { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
+-    { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
++    /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
++    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
++    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
++    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
++    { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
++    { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
++    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
++    { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
++    { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" },
++    { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" },
++    { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
++
++    /* Code names for free GNU/Linux distributions */
++    { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
++    { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
++    { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" },
++    { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" },
++    { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" },
++    { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
++
++    /* Regular names of free GNU/Linux distributions */
++    { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
++    { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
++    { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
++    { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
++    { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
++    { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
++    { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
++    { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
++    { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },
++    { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" },
++    { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" },
++    { QRegExp("Mus", Qt::CaseInsensitive), "Musix" },
++    { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
++    { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
++    { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
++    { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
+ 
+-    /* Code names for Linux distributions: */
++    /* Code names for non-free GNU/Linux distributions: */
+     { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
+     { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
+     { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
+@@ -90,7 +90,7 @@
+     { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
+     { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
+ 
+-    /* Regular names of Linux distributions: */
++    /* Regular names of non-free GNU/Linux distributions: */
+     { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
+     { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
+     { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
+@@ -115,15 +115,38 @@
+     { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
+     { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
+     { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
+-    { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+-    { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
+-    { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
+-    { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
+-    { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
+-    { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
+-    { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
+ 
+-    /* Other: */
++    /* Regular names of non-free operating systems: */
++    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
++    { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
++    { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
++    { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
++    { QRegExp("(Wi.*NT)|(NT4)", Qt::CaseInsensitive), "WindowsNT4" },
++    { QRegExp("((Wi.*XP)|(\\bXP\\b)).*64", Qt::CaseInsensitive), "WindowsXP_64" },
++    { QRegExp("(Wi.*XP)|(\\bXP\\b)", Qt::CaseInsensitive), "WindowsXP" },
++    { QRegExp("((Wi.*2003)|(W2K3)).*64", Qt::CaseInsensitive), "Windows2003_64" },
++    { QRegExp("(Wi.*2003)|(W2K3)", Qt::CaseInsensitive), "Windows2003" },
++    { QRegExp("((Wi.*V)|(Vista)).*64", Qt::CaseInsensitive), "WindowsVista_64" },
++    { QRegExp("(Wi.*V)|(Vista)", Qt::CaseInsensitive), "WindowsVista" },
++    { QRegExp("((Wi.*2008)|(W2K8)).*64", Qt::CaseInsensitive), "Windows2008_64" },
++    { QRegExp("(Wi.*2008)|(W2K8)", Qt::CaseInsensitive), "Windows2008" },
++    { QRegExp("(Wi.*2000)|(W2K)", Qt::CaseInsensitive), "Windows2000" },
++    { QRegExp("(Wi.*7.*64)|(W7.*64)", Qt::CaseInsensitive), "Windows7_64" },
++    { QRegExp("(Wi.*7)|(W7)", Qt::CaseInsensitive), "Windows7" },
++    { QRegExp("(Wi.*8.*64)|(W8.*64)", Qt::CaseInsensitive), "Windows8_64" },
++    { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
++    { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
++    { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
++    { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
++    { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
++    { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
++    { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
++    { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
++    { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
++    { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
++    { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
++    { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
++    { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
+     { QRegExp("L4", Qt::CaseInsensitive), "L4" },
+     { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
+     { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
+@@ -136,6 +159,8 @@
+     { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
+     { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
+     { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
++    
++    /* Other: */
+     { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
+ };
+ 
+--- VirtualBox-4.2.0.orig/src/VBox/Main/xml/Settings.cpp	2012-08-29 11:13:34.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Main/xml/Settings.cpp	2012-10-03 17:02:44.581501053 -0300
+@@ -3405,7 +3405,18 @@
+     { "netware", "Netware" },
+     { "solaris", "Solaris" },
+     { "opensolaris", "OpenSolaris" },
+-    { "l4", "L4" }
++    { "l4", "L4" },
++    { "gnu", "GNU" },
++    { "gnuhurd", "GNUHurd" },
++    { "parabola", "Parabola" },
++    { "gnewsense", "gNewSense" },
++    { "blag", "Blag" },
++    { "dragora", "Dragora" },
++    { "ututo", "Ututo" },
++    { "musix", "Musix" },
++    { "trisquel", "Trisquel" },
++    { "dynebolic", "Dynebolic" },
++    { "venenux", "Venenux" }
  };
  
- uint32_t Global::cOSTypes = RT_ELEMENTS(Global::sOSTypes);
+ void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)
+--- VirtualBox-4.2.0.orig/src/VBox/Main/xml/SettingsConverter.xsl	2012-09-04 09:48:43.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Main/xml/SettingsConverter.xsl	2012-10-03 17:02:10.780019131 -0300
+@@ -763,6 +763,17 @@
+         <xsl:when test="@OSType='solaris'">Solaris</xsl:when>
+         <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when>
+         <xsl:when test="@OSType='l4'">L4</xsl:when>
++        <xsl:when test="@OSType='gnu'">GNU</xsl:when>
++        <xsl:when test="@OSType='gnuhurd'">GNUHurd</xsl:when>
++        <xsl:when test="@OSType='parabola'">Parabola</xsl:when>
++        <xsl:when test="@OSType='gnewsense'">gNewSense</xsl:when>
++        <xsl:when test="@OSType='blag'">Blag</xsl:when>
++        <xsl:when test="@OSType='dragora'">Dragora</xsl:when>
++        <xsl:when test="@OSType='ututo'">Ututo</xsl:when>
++        <xsl:when test="@OSType='musix'">Musix</xsl:when>
++        <xsl:when test="@OSType='trisquel'">Trisquel</xsl:when>
++        <xsl:when test="@OSType='dynebolic'">Dynebolic</xsl:when>
++        <xsl:when test="@OSType='venenux'">Venenux</xsl:when>
+       </xsl:choose>
+     </xsl:attribute>
+     <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/>
+--- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2012-05-30 07:39:18.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc	2012-10-03 00:13:20.408089706 -0300
+@@ -70,6 +70,24 @@
+         <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
+         <file alias="os_macosx.png">images/os_macosx.png</file>
+         <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
++        <file alias="os_parabola.png">images/os_parabola.png</file>
++        <file alias="os_parabola_64.png">images/os_parabola_64.png</file>
++        <file alias="os_gnewsense.png">images/os_gnewsense.png</file>
++        <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file>
++        <file alias="os_blag.png">images/os_blag.png</file>
++        <file alias="os_blag_64.png">images/os_blag_64.png</file>
++        <file alias="os_ututo.png">images/os_ututo.png</file>
++        <file alias="os_ututo_64.png">images/os_ututo_64.png</file>
++        <file alias="os_gnu.png">images/os_gnu.png</file>
++        <file alias="os_gnu_64.png">images/os_gnu_64.png</file>
++        <file alias="os_musix.png">images/os_musix.png</file>
++        <file alias="os_musix_64.png">images/os_musix_64.png</file>
++        <file alias="os_dragora.png">images/os_dragora.png</file>
++        <file alias="os_dragora_64.png">images/os_dragora_64.png</file>
++        <file alias="os_dynebolic.png">images/os_dynebolic.png</file>
++        <file alias="os_venenux.png">images/os_venenux.png</file>
++        <file alias="os_trisquel.png">images/os_trisquel.png</file>
++        <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file>
+         <file alias="hd_16px.png">images/hd_16px.png</file>
+         <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
+         <file alias="hd_32px.png">images/hd_32px.png</file>
 --- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2012-09-04 09:48:45.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp		2012-09-19 02:10:41.293426675 -0300
-@@ -4283,76 +4283,27 @@
-     static const char *kOSTypeIcons [][2] =
-     {
-         {"Other",           ":/os_other.png"},
--        {"DOS",             ":/os_dos.png"},
--        {"Netware",         ":/os_netware.png"},
--        {"L4",              ":/os_l4.png"},
--        {"Windows31",       ":/os_win31.png"},
--        {"Windows95",       ":/os_win95.png"},
--        {"Windows98",       ":/os_win98.png"},
--        {"WindowsMe",       ":/os_winme.png"},
--        {"WindowsNT4",      ":/os_winnt4.png"},
--        {"Windows2000",     ":/os_win2k.png"},
--        {"WindowsXP",       ":/os_winxp.png"},
--        {"WindowsXP_64",    ":/os_winxp_64.png"},
--        {"Windows2003",     ":/os_win2k3.png"},
--        {"Windows2003_64",  ":/os_win2k3_64.png"},
--        {"WindowsVista",    ":/os_winvista.png"},
--        {"WindowsVista_64", ":/os_winvista_64.png"},
--        {"Windows2008",     ":/os_win2k8.png"},
--        {"Windows2008_64",  ":/os_win2k8_64.png"},
--        {"Windows7",        ":/os_win7.png"},
--        {"Windows7_64",     ":/os_win7_64.png"},
--        {"Windows8",        ":/os_win8.png"},
--        {"Windows8_64",     ":/os_win8_64.png"},
--        {"WindowsNT",       ":/os_win_other.png"},
--        {"OS2Warp3",        ":/os_os2warp3.png"},
--        {"OS2Warp4",        ":/os_os2warp4.png"},
--        {"OS2Warp45",       ":/os_os2warp45.png"},
--        {"OS2eCS",          ":/os_os2ecs.png"},
--        {"OS2",             ":/os_os2_other.png"},
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	2012-10-03 17:03:46.114796857 -0300
+@@ -4310,11 +4310,11 @@
+         {"OS2Warp45",       ":/os_os2warp45.png"},
+         {"OS2eCS",          ":/os_os2ecs.png"},
+         {"OS2",             ":/os_os2_other.png"},
 -        {"Linux22",         ":/os_linux22.png"},
 -        {"Linux24",         ":/os_linux24.png"},
 -        {"Linux24_64",      ":/os_linux24_64.png"},
 -        {"Linux26",         ":/os_linux26.png"},
 -        {"Linux26_64",      ":/os_linux26_64.png"},
--        {"ArchLinux",       ":/os_archlinux.png"},
--        {"ArchLinux_64",    ":/os_archlinux_64.png"},
--        {"Debian",          ":/os_debian.png"},
--        {"Debian_64",       ":/os_debian_64.png"},
--        {"OpenSUSE",        ":/os_opensuse.png"},
--        {"OpenSUSE_64",     ":/os_opensuse_64.png"},
--        {"Fedora",          ":/os_fedora.png"},
--        {"Fedora_64",       ":/os_fedora_64.png"},
--        {"Gentoo",          ":/os_gentoo.png"},
--        {"Gentoo_64",       ":/os_gentoo_64.png"},
--        {"Mandriva",        ":/os_mandriva.png"},
--        {"Mandriva_64",     ":/os_mandriva_64.png"},
--        {"RedHat",          ":/os_redhat.png"},
--        {"RedHat_64",       ":/os_redhat_64.png"},
--        {"Turbolinux",      ":/os_turbolinux.png"},
--        {"Turbolinux_64",   ":/os_turbolinux_64.png"},
--        {"Ubuntu",          ":/os_ubuntu.png"},
--        {"Ubuntu_64",       ":/os_ubuntu_64.png"},
--        {"Xandros",         ":/os_xandros.png"},
--        {"Xandros_64",      ":/os_xandros_64.png"},
--        {"Oracle",          ":/os_oracle.png"},
--        {"Oracle_64",       ":/os_oracle_64.png"},
++        {"Linux22",         ":/os_gnu.png"},
++        {"Linux24",         ":/os_gnu.png"},
++        {"Linux24_64",      ":/os_gnu_64.png"},
++        {"Linux26",         ":/os_gnu.png"},
++        {"Linux26_64",      ":/os_gnu_64.png"},
+         {"ArchLinux",       ":/os_archlinux.png"},
+         {"ArchLinux_64",    ":/os_archlinux_64.png"},
+         {"Debian",          ":/os_debian.png"},
+@@ -4337,7 +4337,7 @@
+         {"Xandros_64",      ":/os_xandros_64.png"},
+         {"Oracle",          ":/os_oracle.png"},
+         {"Oracle_64",       ":/os_oracle_64.png"},
 -        {"Linux",           ":/os_linux_other.png"},
--        {"FreeBSD",         ":/os_freebsd.png"},
--        {"FreeBSD_64",      ":/os_freebsd_64.png"},
--        {"OpenBSD",         ":/os_openbsd.png"},
--        {"OpenBSD_64",      ":/os_openbsd_64.png"},
--        {"NetBSD",          ":/os_netbsd.png"},
--        {"NetBSD_64",       ":/os_netbsd_64.png"},
--        {"Solaris",         ":/os_solaris.png"},
--        {"Solaris_64",      ":/os_solaris_64.png"},
--        {"OpenSolaris",     ":/os_oraclesolaris.png"},
--        {"OpenSolaris_64",  ":/os_oraclesolaris_64.png"},
--        {"Solaris11_64",    ":/os_oraclesolaris_64.png"},
--        {"QNX",             ":/os_qnx.png"},
--        {"MacOS",           ":/os_macosx.png"},
--        {"MacOS_64",        ":/os_macosx_64.png"},
--        {"JRockitVE",       ":/os_jrockitve.png"},
++        {"Linux",           ":/os_gnu.png"},
+         {"FreeBSD",         ":/os_freebsd.png"},
+         {"FreeBSD_64",      ":/os_freebsd_64.png"},
+         {"OpenBSD",         ":/os_openbsd.png"},
+@@ -4353,6 +4353,25 @@
+         {"MacOS",           ":/os_macosx.png"},
+         {"MacOS_64",        ":/os_macosx_64.png"},
+         {"JRockitVE",       ":/os_jrockitve.png"},
 +        {"GNU",             ":/os_gnu.png"},
 +        {"GNU_64",          ":/os_gnu_64.png"},
-+        {"GNUHurd",         ":/os_gnuhurd.png"},
-+        {"GNULinux",        ":/os_gnulinux.png"},
-+        {"GNULinux_64",     ":/os_gnulinux_64.png"},
++        {"GNUHurd",         ":/os_gnu.png"},
 +        {"Parabola",        ":/os_parabola.png"},
 +        {"Parabola_64",     ":/os_parabola_64.png"},
 +        {"gNewSense",       ":/os_gnewsense.png"},
@@ -865,233 +774,46 @@
      for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
      {
 --- VirtualBox-4.2.0.orig/include/VBox/ostypes.h	2012-09-08 06:35:56.000000000 -0300
-+++ VirtualBox-4.2.0/include/VBox/ostypes.h	2012-09-19 02:20:24.640916587 -0300
-@@ -43,79 +43,27 @@
- typedef enum VBOXOSTYPE
- {
-     VBOXOSTYPE_Unknown          = 0,
--    VBOXOSTYPE_DOS              = 0x10000,
--    VBOXOSTYPE_Win31            = 0x15000,
--    VBOXOSTYPE_Win9x            = 0x20000,
--    VBOXOSTYPE_Win95            = 0x21000,
--    VBOXOSTYPE_Win98            = 0x22000,
--    VBOXOSTYPE_WinMe            = 0x23000,
--    VBOXOSTYPE_WinNT            = 0x30000,
--    VBOXOSTYPE_WinNT4           = 0x31000,
--    VBOXOSTYPE_Win2k            = 0x32000,
--    VBOXOSTYPE_WinXP            = 0x33000,
--    VBOXOSTYPE_WinXP_x64        = 0x33100,
--    VBOXOSTYPE_Win2k3           = 0x34000,
--    VBOXOSTYPE_Win2k3_x64       = 0x34100,
--    VBOXOSTYPE_WinVista         = 0x35000,
--    VBOXOSTYPE_WinVista_x64     = 0x35100,
--    VBOXOSTYPE_Win2k8           = 0x36000,
--    VBOXOSTYPE_Win2k8_x64       = 0x36100,
--    VBOXOSTYPE_Win7             = 0x37000,
--    VBOXOSTYPE_Win7_x64         = 0x37100,
--    VBOXOSTYPE_Win8             = 0x38000,
--    VBOXOSTYPE_Win8_x64         = 0x38100,
--    VBOXOSTYPE_Win2k12_x64      = 0x39100,
--    VBOXOSTYPE_OS2              = 0x40000,
--    VBOXOSTYPE_OS2Warp3         = 0x41000,
--    VBOXOSTYPE_OS2Warp4         = 0x42000,
--    VBOXOSTYPE_OS2Warp45        = 0x43000,
--    VBOXOSTYPE_ECS              = 0x44000,
--    VBOXOSTYPE_Linux            = 0x50000,
--    VBOXOSTYPE_Linux_x64        = 0x50100,
--    VBOXOSTYPE_Linux22          = 0x51000,
--    VBOXOSTYPE_Linux24          = 0x52000,
--    VBOXOSTYPE_Linux24_x64      = 0x52100,
--    VBOXOSTYPE_Linux26          = 0x53000,
--    VBOXOSTYPE_Linux26_x64      = 0x53100,
--    VBOXOSTYPE_ArchLinux        = 0x54000,
--    VBOXOSTYPE_ArchLinux_x64    = 0x54100,
--    VBOXOSTYPE_Debian           = 0x55000,
--    VBOXOSTYPE_Debian_x64       = 0x55100,
--    VBOXOSTYPE_OpenSUSE         = 0x56000,
--    VBOXOSTYPE_OpenSUSE_x64     = 0x56100,
--    VBOXOSTYPE_FedoraCore       = 0x57000,
--    VBOXOSTYPE_FedoraCore_x64   = 0x57100,
--    VBOXOSTYPE_Gentoo           = 0x58000,
--    VBOXOSTYPE_Gentoo_x64       = 0x58100,
--    VBOXOSTYPE_Mandriva         = 0x59000,
--    VBOXOSTYPE_Mandriva_x64     = 0x59100,
--    VBOXOSTYPE_RedHat           = 0x5A000,
--    VBOXOSTYPE_RedHat_x64       = 0x5A100,
--    VBOXOSTYPE_Turbolinux       = 0x5B000,
--    VBOXOSTYPE_Turbolinux_x64   = 0x5B100,
--    VBOXOSTYPE_Ubuntu           = 0x5C000,
--    VBOXOSTYPE_Ubuntu_x64       = 0x5C100,
--    VBOXOSTYPE_Xandros          = 0x5D000,
--    VBOXOSTYPE_Xandros_x64      = 0x5D100,
--    VBOXOSTYPE_Oracle           = 0x5E000,
--    VBOXOSTYPE_Oracle_x64       = 0x5E100,
--    VBOXOSTYPE_FreeBSD          = 0x60000,
--    VBOXOSTYPE_FreeBSD_x64      = 0x60100,
--    VBOXOSTYPE_OpenBSD          = 0x61000,
--    VBOXOSTYPE_OpenBSD_x64      = 0x61100,
--    VBOXOSTYPE_NetBSD           = 0x62000,
--    VBOXOSTYPE_NetBSD_x64       = 0x62100,
--    VBOXOSTYPE_Netware          = 0x70000,
--    VBOXOSTYPE_Solaris          = 0x80000,
--    VBOXOSTYPE_Solaris_x64      = 0x80100,
--    VBOXOSTYPE_OpenSolaris      = 0x81000,
--    VBOXOSTYPE_OpenSolaris_x64  = 0x81100,
--    VBOXOSTYPE_Solaris11_x64    = 0x82100,
--    VBOXOSTYPE_L4               = 0x90000,
--    VBOXOSTYPE_QNX              = 0xA0000,
--    VBOXOSTYPE_MacOS            = 0xB0000,
--    VBOXOSTYPE_MacOS_x64        = 0xB0100,
--    VBOXOSTYPE_JRockitVE        = 0xC0000,
-+    VBOXOSTYPE_GNU              = 0x10000,
-+    VBOXOSTYPE_GNU_x64          = 0x10100,
-+    VBOXOSTYPE_GNUHurd          = 0x20000,
-+    VBOXOSTYPE_GNULinux         = 0x30000,
-+    VBOXOSTYPE_GNULinux_x64     = 0x30100,
-+    VBOXOSTYPE_Parabola         = 0x31000,
-+    VBOXOSTYPE_Parabola_x64     = 0x31100,
-+    VBOXOSTYPE_gNewSense        = 0x32000,
-+    VBOXOSTYPE_gNewSense_x64    = 0x32100,
-+    VBOXOSTYPE_Blag             = 0x33000,
-+    VBOXOSTYPE_Blag_x64         = 0x33100,
-+    VBOXOSTYPE_Dragora          = 0x34000,
-+    VBOXOSTYPE_Dragora_x64      = 0x34100,
-+    VBOXOSTYPE_Ututo            = 0x35000,
-+    VBOXOSTYPE_Ututo_x64        = 0x35100,
-+    VBOXOSTYPE_Musix            = 0x36000,
-+    VBOXOSTYPE_Musix_x64        = 0x36100,
-+    VBOXOSTYPE_Trisquel         = 0x37000,
-+    VBOXOSTYPE_Trisquel_x64     = 0x37100,
-+    VBOXOSTYPE_Dynebolic        = 0x38000,
-+    VBOXOSTYPE_Venenux          = 0x39000,
++++ VirtualBox-4.2.0/include/VBox/ostypes.h	2012-10-03 17:07:12.143504689 -0300
+@@ -116,6 +116,25 @@
+     VBOXOSTYPE_MacOS            = 0xB0000,
+     VBOXOSTYPE_MacOS_x64        = 0xB0100,
+     VBOXOSTYPE_JRockitVE        = 0xC0000,
++    VBOXOSTYPE_GNU              = 0xD0000,
++    VBOXOSTYPE_GNU_x64          = 0xD0100,
++    VBOXOSTYPE_GNUHurd          = 0xE0000,
++    VBOXOSTYPE_Parabola         = 0xF0000,
++    VBOXOSTYPE_Parabola_x64     = 0xF0100,
++    VBOXOSTYPE_gNewSense        = 0xF1000,
++    VBOXOSTYPE_gNewSense_x64    = 0xF1100,
++    VBOXOSTYPE_Blag             = 0xF2000,
++    VBOXOSTYPE_Blag_x64         = 0xF2100,
++    VBOXOSTYPE_Dragora          = 0xF3000,
++    VBOXOSTYPE_Dragora_x64      = 0xF3100,
++    VBOXOSTYPE_Ututo            = 0xF4000,
++    VBOXOSTYPE_Ututo_x64        = 0xF4100,
++    VBOXOSTYPE_Musix            = 0xF5000,
++    VBOXOSTYPE_Musix_x64        = 0xF5100,
++    VBOXOSTYPE_Trisquel         = 0xF6000,
++    VBOXOSTYPE_Trisquel_x64     = 0xF6100,
++    VBOXOSTYPE_Dynebolic        = 0xF7000,
++    VBOXOSTYPE_Venenux          = 0xF8000,
  /** The bit number which indicates 64-bit or 32-bit. */
  #define VBOXOSTYPE_x64_BIT       8
      /** The mask which indicates 64-bit. */
-@@ -131,16 +79,11 @@
- typedef enum VBOXOSFAMILY
- {
-     VBOXOSFAMILY_Unknown          = 0,
--    VBOXOSFAMILY_Windows32        = 1,
--    VBOXOSFAMILY_Windows64        = 2,
--    VBOXOSFAMILY_Linux32          = 3,
--    VBOXOSFAMILY_Linux64          = 4,
--    VBOXOSFAMILY_FreeBSD32        = 5,
--    VBOXOSFAMILY_FreeBSD64        = 6,
--    VBOXOSFAMILY_Solaris32        = 7,
--    VBOXOSFAMILY_Solaris64        = 8,
--    VBOXOSFAMILY_MacOSX32         = 9,
--    VBOXOSFAMILY_MacOSX64         = 10,
-+    VBOXOSFAMILY_GNU32            = 1,
-+    VBOXOSFAMILY_GNU64            = 2,
-+    VBOXOSFAMILY_GNUHurd          = 3,
-+    VBOXOSFAMILY_GNULinux32       = 4,
-+    VBOXOSFAMILY_GNULinux64       = 5,
-     /** The usual 32-bit hack. */
-     VBOXOSFAMILY_32BIT_HACK = 0x7fffffff
- } VBOXOSFAMILY;
 --- VirtualBox-4.2.0.orig/src/VBox/Main/src-server/ApplianceImpl.cpp	2012-08-03 09:28:30.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp		2012-09-19 04:40:38.226412294 -0300
-@@ -50,94 +50,33 @@
- g_osTypes[] =
- {
-     { ovf::CIMOSType_CIMOS_Unknown,                              VBOXOSTYPE_Unknown },
--    { ovf::CIMOSType_CIMOS_OS2,                                  VBOXOSTYPE_OS2 },
--    { ovf::CIMOSType_CIMOS_OS2,                                  VBOXOSTYPE_OS2Warp3 },
--    { ovf::CIMOSType_CIMOS_OS2,                                  VBOXOSTYPE_OS2Warp4 },
--    { ovf::CIMOSType_CIMOS_OS2,                                  VBOXOSTYPE_OS2Warp45 },
--    { ovf::CIMOSType_CIMOS_MSDOS,                                VBOXOSTYPE_DOS },
--    { ovf::CIMOSType_CIMOS_WIN3x,                                VBOXOSTYPE_Win31 },
--    { ovf::CIMOSType_CIMOS_WIN95,                                VBOXOSTYPE_Win95 },
--    { ovf::CIMOSType_CIMOS_WIN98,                                VBOXOSTYPE_Win98 },
--    { ovf::CIMOSType_CIMOS_WINNT,                                VBOXOSTYPE_WinNT },
--    { ovf::CIMOSType_CIMOS_WINNT,                                VBOXOSTYPE_WinNT4 },
--    { ovf::CIMOSType_CIMOS_NetWare,                              VBOXOSTYPE_Netware },
--    { ovf::CIMOSType_CIMOS_NovellOES,                            VBOXOSTYPE_Netware },
--    { ovf::CIMOSType_CIMOS_Solaris,                              VBOXOSTYPE_Solaris },
--    { ovf::CIMOSType_CIMOS_SunOS,                                VBOXOSTYPE_Solaris },
--    { ovf::CIMOSType_CIMOS_FreeBSD,                              VBOXOSTYPE_FreeBSD },
--    { ovf::CIMOSType_CIMOS_NetBSD,                               VBOXOSTYPE_NetBSD },
--    { ovf::CIMOSType_CIMOS_QNX,                                  VBOXOSTYPE_QNX },
--    { ovf::CIMOSType_CIMOS_Windows2000,                          VBOXOSTYPE_Win2k },
--    { ovf::CIMOSType_CIMOS_WindowsMe,                            VBOXOSTYPE_WinMe },
--    { ovf::CIMOSType_CIMOS_OpenBSD,                              VBOXOSTYPE_OpenBSD },
--    { ovf::CIMOSType_CIMOS_WindowsXP,                            VBOXOSTYPE_WinXP },
--    { ovf::CIMOSType_CIMOS_WindowsXPEmbedded,                    VBOXOSTYPE_WinXP },
--    { ovf::CIMOSType_CIMOS_WindowsEmbeddedforPointofService,     VBOXOSTYPE_WinXP },
--    { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003,           VBOXOSTYPE_Win2k3 },
--    { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2003_64,        VBOXOSTYPE_Win2k3_x64 },
--    { ovf::CIMOSType_CIMOS_WindowsXP_64,                         VBOXOSTYPE_WinXP_x64 },
--    { ovf::CIMOSType_CIMOS_WindowsVista,                         VBOXOSTYPE_WinVista },
--    { ovf::CIMOSType_CIMOS_WindowsVista_64,                      VBOXOSTYPE_WinVista_x64 },
--    { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008,           VBOXOSTYPE_Win2k8 },
--    { ovf::CIMOSType_CIMOS_MicrosoftWindowsServer2008_64,        VBOXOSTYPE_Win2k8_x64 },
--    { ovf::CIMOSType_CIMOS_FreeBSD_64,                           VBOXOSTYPE_FreeBSD_x64 },
--    { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS },
--    { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS_x64 },            // there is no CIM 64-bit type for this
--
++++ VirtualBox-4.2.0/src/VBox/Main/src-server/ApplianceImpl.cpp	2012-10-03 17:11:27.739487250 -0300
+@@ -84,7 +84,32 @@
+     { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS },
+     { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS_x64 },            // there is no CIM 64-bit type for this
+ 
 -    // Linuxes
--    { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux,                VBOXOSTYPE_RedHat },
--    { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64,             VBOXOSTYPE_RedHat_x64 },
--    { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_Solaris_x64 },
--    { ovf::CIMOSType_CIMOS_SUSE,                                 VBOXOSTYPE_OpenSUSE },
--    { ovf::CIMOSType_CIMOS_SLES,                                 VBOXOSTYPE_OpenSUSE },
--    { ovf::CIMOSType_CIMOS_NovellLinuxDesktop,                   VBOXOSTYPE_OpenSUSE },
--    { ovf::CIMOSType_CIMOS_SUSE_64,                              VBOXOSTYPE_OpenSUSE_x64 },
--    { ovf::CIMOSType_CIMOS_SLES_64,                              VBOXOSTYPE_OpenSUSE_x64 },
--    { ovf::CIMOSType_CIMOS_LINUX,                                VBOXOSTYPE_Linux },
--    { ovf::CIMOSType_CIMOS_LINUX,                                VBOXOSTYPE_Linux22 },
--    { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem,                 VBOXOSTYPE_Linux },
--    { ovf::CIMOSType_CIMOS_TurboLinux,                           VBOXOSTYPE_Turbolinux },
--    { ovf::CIMOSType_CIMOS_TurboLinux_64,                        VBOXOSTYPE_Turbolinux_x64 },
--    { ovf::CIMOSType_CIMOS_Mandriva,                             VBOXOSTYPE_Mandriva },
--    { ovf::CIMOSType_CIMOS_Mandriva_64,                          VBOXOSTYPE_Mandriva_x64 },
--    { ovf::CIMOSType_CIMOS_Ubuntu,                               VBOXOSTYPE_Ubuntu },
--    { ovf::CIMOSType_CIMOS_Ubuntu_64,                            VBOXOSTYPE_Ubuntu_x64 },
--    { ovf::CIMOSType_CIMOS_Debian,                               VBOXOSTYPE_Debian },
--    { ovf::CIMOSType_CIMOS_Debian_64,                            VBOXOSTYPE_Debian_x64 },
--    { ovf::CIMOSType_CIMOS_Linux_2_4_x,                          VBOXOSTYPE_Linux24 },
--    { ovf::CIMOSType_CIMOS_Linux_2_4_x_64,                       VBOXOSTYPE_Linux24_x64 },
--    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Linux26 },
--    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Linux26_x64 },
--    { ovf::CIMOSType_CIMOS_Linux_64,                             VBOXOSTYPE_Linux26_x64 },
--
--    // types that we have support for but CIM doesn't
--    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_ArchLinux },
--    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_ArchLinux_x64 },
--    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_FedoraCore },
--    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_FedoraCore_x64 },
--    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Gentoo },
--    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Gentoo_x64 },
--    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Xandros },
--    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Xandros_x64 },
--    { ovf::CIMOSType_CIMOS_Solaris,                              VBOXOSTYPE_OpenSolaris },
--    { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_OpenSolaris_x64 },
--
--    // types added with CIM 2.25.0 follow:
--    { ovf::CIMOSType_CIMOS_WindowsServer2008R2,                  VBOXOSTYPE_Win2k8 },           // duplicate, see above
--//     { ovf::CIMOSType_CIMOS_VMwareESXi = 104,                                                 // we can't run ESX in a VM
--    { ovf::CIMOSType_CIMOS_Windows7,                             VBOXOSTYPE_Win7 },
--    { ovf::CIMOSType_CIMOS_Windows7,                             VBOXOSTYPE_Win7_x64 },         // there is no CIM 64-bit type for this
--    { ovf::CIMOSType_CIMOS_CentOS,                               VBOXOSTYPE_RedHat },
--    { ovf::CIMOSType_CIMOS_CentOS_64,                            VBOXOSTYPE_RedHat_x64 },
--    { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux,                VBOXOSTYPE_Oracle },
--    { ovf::CIMOSType_CIMOS_OracleEnterpriseLinux_64,             VBOXOSTYPE_Oracle_x64 },
--    { ovf::CIMOSType_CIMOS_eComStation,                          VBOXOSTYPE_ECS }
--
--    // there are no CIM types for these, so these turn to "other" on export:
--    //      VBOXOSTYPE_OpenBSD
--    //      VBOXOSTYPE_OpenBSD_x64
--    //      VBOXOSTYPE_NetBSD
--    //      VBOXOSTYPE_NetBSD_x64
-+
-+    // Custom OS
++    // Custom GNU and GNU-Hurd OS
 +    { ovf::CIMOSType_CIMOS_GNU,                                  VBOXOSTYPE_GNU },
 +    { ovf::CIMOSType_CIMOS_GNU_64,                               VBOXOSTYPE_GNU_x64 },
 +    { ovf::CIMOSType_CIMOS_GNUHurd,                              VBOXOSTYPE_GNUHurd },
-+    { ovf::CIMOSType_CIMOS_GNULinux,                             VBOXOSTYPE_GNULinux },
-+    { ovf::CIMOSType_CIMOS_GNULinux_64,                          VBOXOSTYPE_GNULinux_x64 },
-+
-+    // GNU/Linux free distros
++    
++    // Free GNU/Linux distros
 +    { ovf::CIMOSType_CIMOS_gNewSense,                            VBOXOSTYPE_gNewSense },
 +    { ovf::CIMOSType_CIMOS_gNewSense_64,                         VBOXOSTYPE_gNewSense_x64 },
 +    { ovf::CIMOSType_CIMOS_Dragora,                              VBOXOSTYPE_Dragora },
@@ -1103,17 +825,28 @@
 +    { ovf::CIMOSType_CIMOS_Dynebolic,                            VBOXOSTYPE_Dynebolic },
 +    { ovf::CIMOSType_CIMOS_Venenux,                              VBOXOSTYPE_Venenux },
 +    
-+    // GNU/Linux free distros that we have support for but CIM doesn't
-+    { ovf::CIMOSType_CIMOS_GNULinux,                             VBOXOSTYPE_Parabola },
-+    { ovf::CIMOSType_CIMOS_GNULinux_64,                          VBOXOSTYPE_Parabola_x64 },
-+    { ovf::CIMOSType_CIMOS_GNULinux,                             VBOXOSTYPE_Blag },
-+    { ovf::CIMOSType_CIMOS_GNULinux_64,                          VBOXOSTYPE_Blag_x64 },
-+    { ovf::CIMOSType_CIMOS_GNULinux,                             VBOXOSTYPE_Ututo },
-+    { ovf::CIMOSType_CIMOS_GNULinux_64,                          VBOXOSTYPE_Ututo_x64 },
- 
- };
++    // Free GNU/Linux distros that we have support for but CIM doesn't
++    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Parabola },
++    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Parabola_x64 },
++    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Blag },
++    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Blag_x64 },
++    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Ututo },
++    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Ututo_x64 },
++
++    // Non-free GNU/Linux distros
+     { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux,                VBOXOSTYPE_RedHat },
+     { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64,             VBOXOSTYPE_RedHat_x64 },
+     { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_Solaris_x64 },
+@@ -110,7 +135,7 @@
+     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Linux26_x64 },
+     { ovf::CIMOSType_CIMOS_Linux_64,                             VBOXOSTYPE_Linux26_x64 },
  
-@@ -151,53 +90,32 @@
+-    // types that we have support for but CIM doesn't
++    // Non-free GNU/Linux distros and non-free operating systems types that we have support for but CIM doesn't
+     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_ArchLinux },
+     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_ArchLinux_x64 },
+     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_FedoraCore },
+@@ -151,53 +176,72 @@
  /* These are the 32-Bit ones. They are sorted by priority. */
  static const osTypePattern g_osTypesPattern[] =
  {
@@ -1143,18 +876,43 @@
 -    {"Windows 3.",    VBOXOSTYPE_Win31},
 -    {"DOS",           VBOXOSTYPE_DOS},
 -    {"OS2",           VBOXOSTYPE_OS2}
-+    {"Parabola GNU/Linux-libre", VBOXOSTYPE_Parabola},
-+    {"gNewSense",                VBOXOSTYPE_gNewSense},
-+    {"Blag Linux and GNU",       VBOXOSTYPE_Blag},
-+    {"Dragora",                  VBOXOSTYPE_Dragora},
-+    {"Ututo XS",                 VBOXOSTYPE_Ututo},
-+    {"Musix",                    VBOXOSTYPE_Musix},
-+    {"Trisquel",                 VBOXOSTYPE_Trisquel},
-+    {"Dyne:bolic",               VBOXOSTYPE_Dynebolic},
-+    {"Venenux",                  VBOXOSTYPE_Venenux},
-+    {"GNU",                      VBOXOSTYPE_GNU},
-+    {"GNU-Hurd",                 VBOXOSTYPE_GNUHurd},
-+    {"GNU/Linux",                VBOXOSTYPE_GNULinux},
++    {"Windows NT",         VBOXOSTYPE_WinNT4},
++    {"Windows XP",         VBOXOSTYPE_WinXP},
++    {"Windows 2000",       VBOXOSTYPE_Win2k},
++    {"Windows 2003",       VBOXOSTYPE_Win2k3},
++    {"Windows Vista",      VBOXOSTYPE_WinVista},
++    {"Windows 2008",       VBOXOSTYPE_Win2k8},
++    {"SUSE",               VBOXOSTYPE_OpenSUSE},
++    {"Novell",             VBOXOSTYPE_OpenSUSE},
++    {"Red Hat",            VBOXOSTYPE_RedHat},
++    {"Mandriva",           VBOXOSTYPE_Mandriva},
++    {"Ubuntu",             VBOXOSTYPE_Ubuntu},
++    {"Debian",             VBOXOSTYPE_Debian},
++    {"QNX",                VBOXOSTYPE_QNX},
++    {"GNU/Linux 2.4",      VBOXOSTYPE_Linux24},
++    {"GNU/Linux 2.6",      VBOXOSTYPE_Linux26},
++    {"GNU/Linux",          VBOXOSTYPE_Linux},
++    {"OpenSolaris",        VBOXOSTYPE_OpenSolaris},
++    {"Solaris",            VBOXOSTYPE_OpenSolaris},
++    {"FreeBSD",            VBOXOSTYPE_FreeBSD},
++    {"NetBSD",             VBOXOSTYPE_NetBSD},
++    {"Windows 95",         VBOXOSTYPE_Win95},
++    {"Windows 98",         VBOXOSTYPE_Win98},
++    {"Windows Me",         VBOXOSTYPE_WinMe},
++    {"Windows 3.",         VBOXOSTYPE_Win31},
++    {"DOS",                VBOXOSTYPE_DOS},
++    {"OS2",                VBOXOSTYPE_OS2},
++    {"Parabola",           VBOXOSTYPE_Parabola},
++    {"gNewSense",          VBOXOSTYPE_gNewSense},
++    {"Blag",               VBOXOSTYPE_Blag},
++    {"Dragora",            VBOXOSTYPE_Dragora},
++    {"Ututo XS",           VBOXOSTYPE_Ututo},
++    {"Musix",              VBOXOSTYPE_Musix},
++    {"Trisquel",           VBOXOSTYPE_Trisquel},
++    {"Dyne:bolic",         VBOXOSTYPE_Dynebolic},
++    {"Venenux",            VBOXOSTYPE_Venenux},
++    {"GNU",                VBOXOSTYPE_GNU},
++    {"GNU-Hurd",           VBOXOSTYPE_GNUHurd},
  };
  
  /* These are the 64-Bit ones. They are sorted by priority. */
@@ -1176,190 +934,65 @@
 -    {"OpenSolaris",   VBOXOSTYPE_OpenSolaris_x64},
 -    {"Solaris",       VBOXOSTYPE_OpenSolaris_x64},
 -    {"FreeBSD",       VBOXOSTYPE_FreeBSD_x64},
-+    {"Parabola GNU/Linux-libre", VBOXOSTYPE_Parabola_x64},
-+    {"gNewSense",                VBOXOSTYPE_gNewSense_x64},
-+    {"Blag Linux and GNU",       VBOXOSTYPE_Blag_x64},
-+    {"Dragora",                  VBOXOSTYPE_Dragora_x64},
-+    {"Ututo XS",                 VBOXOSTYPE_Ututo_x64},
-+    {"Musix",                    VBOXOSTYPE_Musix_x64},
-+    {"Trisquel",                 VBOXOSTYPE_Trisquel_x64},
-+    {"GNU",                      VBOXOSTYPE_GNU_x64},
-+    {"GNU/Linux",                VBOXOSTYPE_GNULinux_x64},
++    {"Windows XP",         VBOXOSTYPE_WinXP_x64},
++    {"Windows 2003",       VBOXOSTYPE_Win2k3_x64},
++    {"Windows Vista",      VBOXOSTYPE_WinVista_x64},
++    {"Windows 2008",       VBOXOSTYPE_Win2k8_x64},
++    {"SUSE",               VBOXOSTYPE_OpenSUSE_x64},
++    {"Novell",             VBOXOSTYPE_OpenSUSE_x64},
++    {"Red Hat",            VBOXOSTYPE_RedHat_x64},
++    {"Mandriva",           VBOXOSTYPE_Mandriva_x64},
++    {"Ubuntu",             VBOXOSTYPE_Ubuntu_x64},
++    {"Debian",             VBOXOSTYPE_Debian_x64},
++    {"GNU/Linux 2.4",      VBOXOSTYPE_Linux24_x64},
++    {"GNU/Linux 2.6",      VBOXOSTYPE_Linux26_x64},
++    {"GNU/Linux",          VBOXOSTYPE_Linux26_x64},
++    {"OpenSolaris",        VBOXOSTYPE_OpenSolaris_x64},
++    {"Solaris",            VBOXOSTYPE_OpenSolaris_x64},
++    {"FreeBSD",            VBOXOSTYPE_FreeBSD_x64},
++    {"Parabola",           VBOXOSTYPE_Parabola_x64},
++    {"gNewSense",          VBOXOSTYPE_gNewSense_x64},
++    {"Blag",               VBOXOSTYPE_Blag_x64},
++    {"Dragora",            VBOXOSTYPE_Dragora_x64},
++    {"Ututo XS",           VBOXOSTYPE_Ututo_x64},
++    {"Musix",              VBOXOSTYPE_Musix_x64},
++    {"Trisquel",           VBOXOSTYPE_Trisquel_x64},
++    {"GNU",                VBOXOSTYPE_GNU_x64},
  };
  
  /**
---- VirtualBox-4.1.18.orig/src/VBox/Main/include/ovfreader.h	2012-06-20 10:17:34.000000000 -0300
-+++ VirtualBox-4.1.18/src/VBox/Main/include/ovfreader.h		2012-07-26 03:51:21.807619186 -0300
-@@ -34,119 +34,24 @@
- 
- enum CIMOSType_T
- {
--    CIMOSType_CIMOS_Unknown = 0,
--    CIMOSType_CIMOS_Other   = 1,
--    CIMOSType_CIMOS_MACOS   = 2,
--    CIMOSType_CIMOS_ATTUNIX = 3,
--    CIMOSType_CIMOS_DGUX    = 4,
--    CIMOSType_CIMOS_DECNT   = 5,
--    CIMOSType_CIMOS_Tru64UNIX   = 6,
--    CIMOSType_CIMOS_OpenVMS = 7,
--    CIMOSType_CIMOS_HPUX    = 8,
--    CIMOSType_CIMOS_AIX = 9,
--    CIMOSType_CIMOS_MVS = 10,
--    CIMOSType_CIMOS_OS400   = 11,
--    CIMOSType_CIMOS_OS2 = 12,
--    CIMOSType_CIMOS_JavaVM  = 13,
--    CIMOSType_CIMOS_MSDOS   = 14,
--    CIMOSType_CIMOS_WIN3x   = 15,
--    CIMOSType_CIMOS_WIN95   = 16,
--    CIMOSType_CIMOS_WIN98   = 17,
--    CIMOSType_CIMOS_WINNT   = 18,
--    CIMOSType_CIMOS_WINCE   = 19,
--    CIMOSType_CIMOS_NCR3000 = 20,
--    CIMOSType_CIMOS_NetWare = 21,
--    CIMOSType_CIMOS_OSF = 22,
--    CIMOSType_CIMOS_DCOS    = 23,
--    CIMOSType_CIMOS_ReliantUNIX = 24,
--    CIMOSType_CIMOS_SCOUnixWare = 25,
--    CIMOSType_CIMOS_SCOOpenServer   = 26,
--    CIMOSType_CIMOS_Sequent = 27,
--    CIMOSType_CIMOS_IRIX    = 28,
--    CIMOSType_CIMOS_Solaris = 29,
--    CIMOSType_CIMOS_SunOS   = 30,
--    CIMOSType_CIMOS_U6000   = 31,
--    CIMOSType_CIMOS_ASERIES = 32,
--    CIMOSType_CIMOS_HPNonStopOS = 33,
--    CIMOSType_CIMOS_HPNonStopOSS    = 34,
--    CIMOSType_CIMOS_BS2000  = 35,
--    CIMOSType_CIMOS_LINUX   = 36,
--    CIMOSType_CIMOS_Lynx    = 37,
--    CIMOSType_CIMOS_XENIX   = 38,
--    CIMOSType_CIMOS_VM  = 39,
--    CIMOSType_CIMOS_InteractiveUNIX = 40,
--    CIMOSType_CIMOS_BSDUNIX = 41,
--    CIMOSType_CIMOS_FreeBSD = 42,
--    CIMOSType_CIMOS_NetBSD  = 43,
--    CIMOSType_CIMOS_GNUHurd = 44,
--    CIMOSType_CIMOS_OS9 = 45,
--    CIMOSType_CIMOS_MACHKernel  = 46,
--    CIMOSType_CIMOS_Inferno = 47,
--    CIMOSType_CIMOS_QNX = 48,
--    CIMOSType_CIMOS_EPOC    = 49,
--    CIMOSType_CIMOS_IxWorks = 50,
--    CIMOSType_CIMOS_VxWorks = 51,
--    CIMOSType_CIMOS_MiNT    = 52,
--    CIMOSType_CIMOS_BeOS    = 53,
--    CIMOSType_CIMOS_HPMPE   = 54,
--    CIMOSType_CIMOS_NextStep    = 55,
--    CIMOSType_CIMOS_PalmPilot   = 56,
--    CIMOSType_CIMOS_Rhapsody    = 57,
--    CIMOSType_CIMOS_Windows2000 = 58,
--    CIMOSType_CIMOS_Dedicated   = 59,
--    CIMOSType_CIMOS_OS390   = 60,
--    CIMOSType_CIMOS_VSE = 61,
--    CIMOSType_CIMOS_TPF = 62,
--    CIMOSType_CIMOS_WindowsMe   = 63,
--    CIMOSType_CIMOS_CalderaOpenUNIX = 64,
--    CIMOSType_CIMOS_OpenBSD = 65,
--    CIMOSType_CIMOS_NotApplicable   = 66,
--    CIMOSType_CIMOS_WindowsXP   = 67,
--    CIMOSType_CIMOS_zOS = 68,
--    CIMOSType_CIMOS_MicrosoftWindowsServer2003  = 69,
--    CIMOSType_CIMOS_MicrosoftWindowsServer2003_64   = 70,
--    CIMOSType_CIMOS_WindowsXP_64    = 71,
--    CIMOSType_CIMOS_WindowsXPEmbedded   = 72,
--    CIMOSType_CIMOS_WindowsVista    = 73,
--    CIMOSType_CIMOS_WindowsVista_64 = 74,
--    CIMOSType_CIMOS_WindowsEmbeddedforPointofService    = 75,
--    CIMOSType_CIMOS_MicrosoftWindowsServer2008  = 76,
--    CIMOSType_CIMOS_MicrosoftWindowsServer2008_64   = 77,
--    CIMOSType_CIMOS_FreeBSD_64  = 78,
--    CIMOSType_CIMOS_RedHatEnterpriseLinux   = 79,
--    CIMOSType_CIMOS_RedHatEnterpriseLinux_64    = 80,
--    CIMOSType_CIMOS_Solaris_64  = 81,
--    CIMOSType_CIMOS_SUSE    = 82,
--    CIMOSType_CIMOS_SUSE_64 = 83,
--    CIMOSType_CIMOS_SLES    = 84,
--    CIMOSType_CIMOS_SLES_64 = 85,
--    CIMOSType_CIMOS_NovellOES   = 86,
--    CIMOSType_CIMOS_NovellLinuxDesktop  = 87,
--    CIMOSType_CIMOS_SunJavaDesktopSystem    = 88,
--    CIMOSType_CIMOS_Mandriva    = 89,
--    CIMOSType_CIMOS_Mandriva_64 = 90,
--    CIMOSType_CIMOS_TurboLinux  = 91,
--    CIMOSType_CIMOS_TurboLinux_64   = 92,
--    CIMOSType_CIMOS_Ubuntu  = 93,
--    CIMOSType_CIMOS_Ubuntu_64   = 94,
--    CIMOSType_CIMOS_Debian  = 95,
--    CIMOSType_CIMOS_Debian_64   = 96,
--    CIMOSType_CIMOS_Linux_2_4_x = 97,
--    CIMOSType_CIMOS_Linux_2_4_x_64  = 98,
--    CIMOSType_CIMOS_Linux_2_6_x = 99,
--    CIMOSType_CIMOS_Linux_2_6_x_64  = 100,
--    CIMOSType_CIMOS_Linux_64    = 101,
--    CIMOSType_CIMOS_Other_64    = 102,
--    // types added with CIM 2.25.0 follow:
--    CIMOSType_CIMOS_WindowsServer2008R2 = 103,
--    CIMOSType_CIMOS_VMwareESXi = 104,
--    CIMOSType_CIMOS_Windows7 = 105,
--    CIMOSType_CIMOS_CentOS = 106,
--    CIMOSType_CIMOS_CentOS_64 = 107,
--    CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
--    CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
+--- VirtualBox-4.2.0.orig/src/VBox/Main/include/ovfreader.h	2011-04-28 05:00:56.000000000 -0300
++++ VirtualBox-4.2.0/src/VBox/Main/include/ovfreader.h	2012-10-03 17:13:50.738308572 -0300
+@@ -145,8 +145,20 @@
+     CIMOSType_CIMOS_CentOS_64 = 107,
+     CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
+     CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
 -    CIMOSType_CIMOS_eComStation = 110
--    // no new types added with CIM 2.26.0
-+    CIMOSType_CIMOS_Unknown       = 0,
-+    CIMOSType_CIMOS_Other         = 1,
-+    CIMOSType_CIMOS_Other_64      = 2,
-+    CIMOSType_CIMOS_gNewSense     = 3,
-+    CIMOSType_CIMOS_gNewSense_64  = 4,
-+    CIMOSType_CIMOS_Dragora       = 5,
-+    CIMOSType_CIMOS_Dragora_64    = 6,
-+    CIMOSType_CIMOS_Musix         = 7,
-+    CIMOSType_CIMOS_Musix_64      = 8,
-+    CIMOSType_CIMOS_Trisquel      = 9,
-+    CIMOSType_CIMOS_Trisquel_64   = 10,
-+    CIMOSType_CIMOS_Dynebolic     = 11,
-+    CIMOSType_CIMOS_Venenux       = 12,
-+    CIMOSType_CIMOS_GNU           = 13,
-+    CIMOSType_CIMOS_GNU_64        = 14,
-+    CIMOSType_CIMOS_GNUHurd       = 15,
-+    CIMOSType_CIMOS_GNULinux      = 16,
-+    CIMOSType_CIMOS_GNULinux_64   = 17
++    CIMOSType_CIMOS_eComStation = 110,
+     // no new types added with CIM 2.26.0
++    CIMOSType_CIMOS_gNewSense = 111,
++    CIMOSType_CIMOS_gNewSense_64 = 112,
++    CIMOSType_CIMOS_Dragora = 113,
++    CIMOSType_CIMOS_Dragora_64 = 114,
++    CIMOSType_CIMOS_Musix = 115,
++    CIMOSType_CIMOS_Musix_64 = 116,
++    CIMOSType_CIMOS_Trisquel = 117,
++    CIMOSType_CIMOS_Trisquel_64 = 118,
++    CIMOSType_CIMOS_Dynebolic = 119,
++    CIMOSType_CIMOS_Venenux = 120,
++    CIMOSType_CIMOS_GNU = 121,
++    CIMOSType_CIMOS_GNU_64 = 122
  };
  
  
---- VirtualBox-4.1.18.orig/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	2012-06-20 10:09:01.000000000 -0300
-+++ VirtualBox-4.1.18/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c		2012-07-26 15:32:55.309812685 -0300
-@@ -622,16 +622,16 @@
-              * Call the common device extension initializer.
-              */
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_X86)
--            VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26;
-+            VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux;
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && defined(RT_ARCH_AMD64)
--            VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux26_x64;
-+            VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux_x64;
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_X86)
--            VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24;
-+            VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux;
- #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 4, 0) && defined(RT_ARCH_AMD64)
--            VBOXOSTYPE enmOSType = VBOXOSTYPE_Linux24_x64;
-+            VBOXOSTYPE enmOSType = VBOXOSTYPE_GNULinux_x64;
- #else
- # warning "huh? which arch + version is this?"
--            VBOXOSTYPE enmOsType = VBOXOSTYPE_Linux;
-+            VBOXOSTYPE enmOsType = VBOXOSTYPE_GNULinux;
- #endif
-             rc = VBoxGuestInitDevExt(&g_DevExt,
-                                      g_IOPortBase,
 --- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	2012-07-18 05:58:09.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp		2012-09-18 22:43:54.956086896 -0300
++++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	2012-10-03 22:49:11.871882837 -0300
 @@ -141,7 +141,7 @@
  #ifdef VBOX_WITH_VIDEOHWACCEL
      /* Check if 2D video acceleration supported by the guest OS type: */
      QString strguestOSTypeFamily = m_guestOSType.GetFamilyId();
 -    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows";
-+    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Other";
++    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Non-free OSs";
  #endif /* VBOX_WITH_VIDEOHWACCEL */
  #ifdef VBOX_WITH_CRHGSMI
      /* Check if WDDM mode supported by the guest OS type: */
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index 3bce203ef..b6d804eb7 100755
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -20,18 +20,6 @@ utils() {
 
 # arg 1:  the new package version
 post_install() {
-  cat << EOF
-  virtualbox-libre is a libre version of VirtualBox without Oracle VM VirtualBox
-  Extension Pack support and includes a modified list with free distros presets
-  endorsed by the Free Software Foundation for the virtual machine creation wizard.
-  Non-free distros and others OS presets were removed.
-
-  It could generate problems with virtual machines created on VirtualBox from
-  others distros or operating systems.
-
-  To solve it, read https://parabolagnulinux.org/news/virtualbox-libre-new-version
-EOF
-
   getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers
   utils
 }
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
index c4e72cfea..4c93e1c48 100755
--- a/libre/xulrunner-libre/PKGBUILD
+++ b/libre/xulrunner-libre/PKGBUILD
@@ -6,7 +6,7 @@
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=15.0
+_debver=15.0.1
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -30,8 +30,8 @@ options=('!emptydirs')
 conflicts=('xulrunner')
 provides=("xulrunner=${_debver}")
 replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('aa5a7f08f55a2b02a71c86f30ef75a25'
-         'b93090724434e3801375730744e79950'
+md5sums=('0936242388cd4c75930c1d2487e15216'
+         'ce37c76476b8edf40780d00cf79d0d62'
          'f2f4f4a573f549e8b494e33b3ad226bc'
          '27271ce647a83906ef7a24605e840d61'
          'c52fac65c1e06290a5108b75c31ace79')
diff --git a/pcr/debootstrap/PKGBUILD b/pcr/debootstrap/PKGBUILD
new file mode 100644
index 000000000..6fbb73cae
--- /dev/null
+++ b/pcr/debootstrap/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id$
+# Maintainer: André Silva <emulatorman@lavabit.com>
+
+pkgname=debootstrap
+pkgver=1.0.26
+pkgrel=1
+pkgdesc="A tool used to create a gNewSense base system from scratch, without requiring the availability of dpkg or apt"
+arch=('any')
+license=('GPL')
+url="http://www.gnewsense.org"
+depends=('bash' 'wget')
+optdepends=( 'gnewsense-archive-keyring: checking gNewSense release signatures'
+             'gnupg1:  checking gNewSense release signatures' )
+source=("http://archive.gnewsense.org/gnewsense-three/gnewsense/pool/overlays/parkes/kgoetz/${pkgname}/${pkgname}_${pkgver}+squeeze1+gnewsense1_all.deb") 
+install="debootstrap.install"
+md5sums=('2049317eac54c0fac6c3201a90fadc18')
+
+build(){
+  tar -xzf "${srcdir}/data.tar.gz" -C "${pkgdir}/"
+  # doesn't work with gpg 2.x, patch to point to gpgv1
+  sed 's/gpgv/gpgv1/g;' -i "${pkgdir}/usr/sbin/debootstrap" "${pkgdir}/usr/share/debootstrap/functions"
+}
diff --git a/pcr/debootstrap/debootstrap.install b/pcr/debootstrap/debootstrap.install
new file mode 100644
index 000000000..85a99f160
--- /dev/null
+++ b/pcr/debootstrap/debootstrap.install
@@ -0,0 +1,14 @@
+post_install() {
+  if [ "$(uname -m)" = "x86_64" ]; then
+    darch="amd64"
+  elif [ "$(uname -m)" = "i386" ]; then
+    darch="i386"
+  else
+    darch="mips64el"
+  fi
+  echo "$darch" > /usr/share/debootstrap/arch
+}
+
+pre_remove() {
+  rm -f /usr/share/debootstrap/arch
+}
diff --git a/pcr/ffmpeg-static/PKGBUILD b/pcr/ffmpeg-static/PKGBUILD
index 592c4a7bf..67ce115bb 100644
--- a/pcr/ffmpeg-static/PKGBUILD
+++ b/pcr/ffmpeg-static/PKGBUILD
@@ -5,7 +5,7 @@
 # Maintainer (Parabola): Márcio Silva    <coadde@lavabit.com>
 
 pkgname=ffmpeg-static
-pkgver=0.11.2
+pkgver=1.0
 pkgrel=1
 epoch=1
 pkgdesc='Complete and free Internet live audio and video broadcasting solution for GNU/Linux, with static library'
@@ -17,7 +17,7 @@ makedepends=(yasm libvdpau)
 provides=(${pkgname%-static})
 conflicts=(${pkgname%-static})
 source=(http://${pkgname%-static}.org/releases/${pkgname%-static}-$pkgver.tar.bz2)
-md5sums=(93c1908022567b321df74db7214da6ac)
+md5sums=(3ed526cea20c1bffb5a37f7730f710bd)
 
 build() {
   cd ${pkgname%-static}-$pkgver
diff --git a/pcr/minetest/PKGBUILD b/pcr/minetest/PKGBUILD
index 8d11e3747..18546b470 100755
--- a/pcr/minetest/PKGBUILD
+++ b/pcr/minetest/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname=minetest-git
-pkgver=20120409
-pkgrel=1
+pkgver=20120918
+pkgrel=2
 pkgdesc="An Infiniminer/Minecraft inspired game, git version."
 arch=('i686' 'x86_64')
 url="http://celeron.55.lt/~celeron55/minetest/"
diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD
index dbcd531f4..fce700054 100755
--- a/pcr/ryzom-client/PKGBUILD
+++ b/pcr/ryzom-client/PKGBUILD
@@ -1,42 +1,63 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname=('ryzom-client')
-pkgver=0.8.0
-pkgrel=7
+pkgname=ryzom-client-hg
+pkgver=2691
+pkgrel=3
+pkgdesc='An awesome free software 3D MMORPG game'
 arch=('x86_64' 'i686')
 url="http://www.ryzom.com"
 license=('AGPL3')
-pkgdesc="An awesome free software 3D MMORPG game"
-depends=('ryzom-data' 'ryzom-nel' 'luabind')
-conflicts=('ryzom-client')
 groups=('ryzom')
+depends=('ryzom-data' 'ryzom-nel-hg' 'luabind')
+makedepends=('mercurial' 'kervalasquish-hg'
+             'cmake' 'bison' 'lua' 'luabind'
+	     'curl' 'libpng' 'libwww'
+	     'boost' 'ryzom-nel-hg')
 
-makedepends=('kervalasquish-hg' 'cmake' 'bison'  
-             'lua' 'luabind' 'curl' 'libpng' 'libwww'
-             'boost' 'ryzom-nel')
+conflicts=('ryzom-client' 'ryzom-client-hg')
+replaces=('ryzom-client')
+backup=('etc/client_default.cfg')
+source=('ftp://ftp.ryzom.com/1210062202_client_default.cfg')
+noextract=()
 
-auser="shackra"
-achangeset="56d1642e24ac"
-
-source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
+_hgroot=http://ryzom.hg.sourceforge.net:8000/hgroot/ryzom/ryzom
+_hgrepo=ryzom
 
 build() {
-  cd "$srcdir/$auser-ryzom-$achangeset/code"
-  if [[ -d "ryzom-client" ]]; then
-     rm -rf "ryzom-client"
-     mkdir "ryzom-client"
+  cd "$srcdir"
+  msg "Connecting to Mercurial server...."
+
+  if [[ -d "$_hgrepo" ]]; then
+    cd "$_hgrepo"
+    hg pull -u
+    msg "The local files are updated."
   else
-     mkdir "ryzom-client"
+    hg clone "$_hgroot" "$_hgrepo"
   fi
-  
-  cd "ryzom-client"
-  cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
 
-  make -j3
+  msg "Mercurial checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "$srcdir/$_hgrepo-build"
+  cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
+  mkdir "$srcdir/$_hgrepo-build/code/ryzom-client"
+  cd "$srcdir/$_hgrepo-build/code/ryzom-client"
+
+  #
+  # BUILD HERE
+  #
+  cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc -DRYZOM_GAMES_PREFIX=bin
+  
+ make -j3
+ 
+ # Replacing client_default.cfg file
+ cp "$srcdir/1210062202_client_default.cfg" "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg"
+ sed -i s/"data"/"\/usr\/share\/ryzom\/data"/ "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg"
+ sed -i 's/= 1\.33333;/= 1\.7777;/' "$srcdir/$_hgrepo-build/code/ryzom-client/ryzom/client/client_default.cfg"
 }
 
 package() {
-  cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
+  cd "$srcdir/$_hgrepo-build/code/ryzom-client"
   make DESTDIR="$pkgdir" install
 }
 
-sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')
+sha256sums=('0753c04dd7d61c43ec88d59428752b609d65f439eb1de9018bf922294e65966f')
diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD
index b45bef098..bc9fa3199 100755
--- a/pcr/ryzom-nel/PKGBUILD
+++ b/pcr/ryzom-nel/PKGBUILD
@@ -1,53 +1,68 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
-pkgname='ryzom-nel'
-pkgver=0.8.0
-pkgrel=11
+pkgname=ryzom-nel-hg
+pkgver=2687
+pkgrel=3
+pkgdesc='An awesome free software 3D MMORPG game, NeL engine'
 arch=('x86_64' 'i686')
-conflicts=('ryzom-nel')
-groups=('ryzom')
-
-pkgdesc="An awesome free software 3D MMORPG game, NeL engine"
 url="http://www.ryzom.com"
 license=('AGPL3')
-depends=('freetype2'
-         'libx11' 
-         'mesa' 
-         'libxxf86vm' 
-         'openal' 
-         'freealut' 
-         'libogg' 
-         'libvorbis' 
-         'libxml2' 
-         'libjpeg' 
-         'rrdtool' )
-makedepends=('cmake' 'bison' 'kervalasquish-hg')
-
-auser="shackra"
-achangeset="56d1642e24ac"
-
-source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
+groups=('ryzom')
+depends=('mercurial' 
+	     'freetype2'
+	     'libx11' 
+	     'mesa-git' 
+	     'libxxf86vm' 
+	     'openal' 
+	     'freealut' 
+	     'libogg' 
+	     'libvorbis' 
+	     'libxml2'
+	     'libjpeg-turbo' 
+	     'rrdtool'
+	     'libgl-git')
+makedepends=('mercurial' 'cmake' 'bison')
+
+conflicts=('ryzom-nel' 'ryzom-nel-hg')
+replaces=('ryzom-nel')
+backup=('etc/nel/build_ig_boxes.cfg'
+	'etc/nel/build_indoor_rbank.cfg'
+	'etc/nel/build_rbank.cfg'
+	'etc/nel/make_sheet_id.cfg'
+	'etc/nel/zviewer.cfg')
+
+_hgroot=http://ryzom.hg.sourceforge.net/hgroot/ryzom/ryzom
+_hgrepo=ryzom
 
 build() {
-  cd "$srcdir/$auser-ryzom-$achangeset/code"
- 
-  if [[ -d $pkgname ]]; then
-     rm -rf $pkgname
-     mkdir $pkgname
+  cd "$srcdir"
+  msg "Connecting to Mercurial server...."
+
+  if [[ -d "$_hgrepo" ]]; then
+    cd "$_hgrepo"
+    hg pull -u
+    msg "The local files are updated."
   else
-     mkdir $pkgname
+    hg clone "$_hgroot" "$_hgrepo"
   fi
 
-  cd $pkgname
+  msg "Mercurial checkout done or server timeout"
+  msg "Starting build..."
 
-  #CMAKE_USE_RELATIVE_PATHS=true
-  cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel
+  rm -rf "$srcdir/$_hgrepo-build"
+  cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
+  mkdir "$srcdir/$_hgrepo-build/code/ryzom-nel"
+  cd "$srcdir/$_hgrepo-build/code/ryzom-nel"
 
-  make -j3
+  #
+  # BUILD HERE
+  #
+  cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel
+  
+ make -j3
 }
 
 package() {
-  cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
+  cd "$srcdir/$_hgrepo-build/code/ryzom-nel"
   make DESTDIR="$pkgdir" install
 }
 
-sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')
diff --git a/pcr/yate/PKGBUILD b/pcr/yate/PKGBUILD
index 01428fa27..e668cd3ae 100755..100644
--- a/pcr/yate/PKGBUILD
+++ b/pcr/yate/PKGBUILD
@@ -2,20 +2,21 @@
     # Contributor: Yejun Yang <yejunx AT gmail DOT com>
     # Contributor: Biru Ionut <ionut@archlinux.ro>
     pkgname=yate
-    pkgver=4.1.0
+    pkgver=4.2.0
     pkgrel=1
     pkgdesc="next-generation telephony engine"
     arch=('i686' 'x86_64')
     url="http://yate.null.ro"
     license=('GPL')
     depends=('speex' 'gsm' 'postgresql-libs' 'libmysqlclient' \
-             'alsa-lib')
+             'alsa-lib' 'qt')
     makedepends=('pkgconfig')
-    source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-1.tar.gz yate.init)
+    source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-2.tar.gz yate.init)
     options=(!makeflags)
     
-    md5sums=('06adaa9b8dc4f18908b35e9659ab9ad5'
-         'c0d344607046c47c1d75ac23d323817a')
+    md5sums=('e6fd37f26ff5c50aa3fa16f6b2803d68'
+	     'c0d344607046c47c1d75ac23d323817a')
+
          
     build() {
       cd $srcdir/${pkgname}
diff --git a/pcr/zoneminder/PKGBUILD b/pcr/zoneminder/PKGBUILD
index 91c6c9175..bb850eec2 100644
--- a/pcr/zoneminder/PKGBUILD
+++ b/pcr/zoneminder/PKGBUILD
@@ -8,14 +8,14 @@
 
 pkgname=zoneminder
 pkgver=1.25.0
-pkgrel=16
+pkgrel=17
 pkgdesc='Capture, analyse, record and monitor video security cameras'
 arch=(i686 x86_64 mips64el)
 backup=(etc/zm.conf etc/httpd/conf/extra/httpd-zm.conf)
 url=http://www.$pkgname.com
 license=(GPL)
 depends=(
-  apache cambozola ffmpeg gnutls mysql perl-archive-zip perl-date-manip
+  apache cambozola ffmpeg-static gnutls mysql perl-archive-zip perl-date-manip
   perl-dbd-mysql perl-dbi perl-expect perl-libwww perl-mime-lite
   perl-mime-tools perl-php-serialization perl-net-sftp-foreign perl-sys-mmap
   perl-time-modules perl-x10 php php-apache php-gd php-mcrypt
@@ -24,21 +24,17 @@ makedepends=(netpbm)
 install=$pkgname.install
 source=(
   http://www.$pkgname.com/downloads/ZoneMinder-$pkgver.tar.gz
-  patch-ffmpeg-0.11.patch
-  patch-libavcodec-detection.patch
-  $pkgname-1.25.0-kernel35.patch
   httpd-zm.conf
   zm.rc.d
   $pkgname.service
+  patch-ffmpeg-0.11.patch
 )
 md5sums=(
   eaefa14befd482154970541252aa1a39
-  81c8be870260142e2633eedf73c72040
-  94bf5d95fe5429f7df458ddfbabf0c12
-  48a3c48394e18bf072f7b32730db18df
-  831e3538facff18e27d402e36dbd6b8d
+  25ad042b501aaad98cbe4e05ca0a96c2
   034b61cda8849fc3001849e76ef26041
   7487cc72ead82aea0bc78f2e4106ae1a
+  81c8be870260142e2633eedf73c72040
 )
 build() {
   cd $srcdir/ZoneMinder-$pkgver
@@ -47,65 +43,93 @@ build() {
     ZM_SSL_LIB=gnutls
 
   # Patch for GCC 4.7.x
-  sed -i -e '1 s/^/#include <unistd.h>\n/;' src/zm_logger.cpp
-  sed -i -e '1 s/^/#include <unistd.h>\n/;' src/zm_thread.h
+  sed -i -e 's/^#include <errno.h>/#include <errno.h>\n#include <unistd.h>/' src/zm_logger.cpp
+  sed -i -e 's/^#include <pthread.h>/#include <pthread.h>\n#include <unistd.h>/' src/zm_thread.h
 
-  # Patch for support new ffmpeg
-  patch -p1 < $srcdir/patch-ffmpeg-0.11.patch
+  # Patch for disable ZM_CHECK_FOR_UPDATES
+  sed -i -e '/ZM_CHECK_FOR_UPDATES/,+1 s/yes/no/' scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+
+  # Patch for support html5 video and flv
+  sed -i -e '/ZM_MPEG_LIVE_FORMAT/,+1 s/swf/webm/;/ZM_MPEG_REPLAY_FORMAT/,+1 s/swf/webm/;
+    /ZM_FFMPEG_FORMATS/,+1 s/mpg mpeg wmv asf avi\* mov swf 3gp\*\*/mpg mpeg wmv asf avi\* mov flv swf 3gp\*\* webm ogg h254/'\
+    scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
 
-  # Patch for correct libavcodec detection
-  patch -p0 < $srcdir/patch-libavcodec-detection.patch
+  # Patch for wrong "suppported"
+  sed -i -e 's/suppported/supported/' src/zm_local_camera.cpp
 
-  # Patch for type cast in kernel3.5
-  patch -p0 < $srcdir/$pkgname-1.25.0-kernel35.patch
+  # Patch for type cast in linux-libre kernel 3.5
+  sed -i -e 's/enum v4l2_buf_type type = v4l2_data.fmt.type;/enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;/'\
+    src/zm_local_camera.cpp
+
+  # Patch for drop custom perl install paths
+  sed -i -e '/# Slight hack for non-standard perl install paths/,+10 d;
+    s/^AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")/AC_SUBST(ZM_CONFIG,"$SYSCONFDIR\/zm.conf")\n\nEXTRA_PERL_LIB="# Include from system perl paths only"\nPERL_MM_PARMS="INSTALLDIRS=vendor"/'\
+    configure.ac
+
+  # Patch for support new ffmpeg
+  patch -p1 < $srcdir/patch-ffmpeg-0.11.patch
+#  sed -i -e 's/if ( av_open_input_file( \&mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )/if ( avformat_open_input( \&mFormatContext, mPath.c_str(), NULL, NULL ) !=0 )/;
+#    s/if ( avcodec_open( mCodecContext, mCodec ) < 0 )/if ( avcodec_open2( mCodecContext, mCodec, NULL ) < 0 )/'\
+#    src/zm_ffmpeg_camera.cpp
+#  sed -i -e 's/if ( av_set_parameters(ofc, NULL) < 0 )/\/\*\n     \* Removed in last ffmpeg\n     \* if ( av_set_parameters(ofc, NULL) < 0 )/;
+#    /Panic( "Invalid output format parameters" );/,+1 s/}/}\*/;
+#    /if ( avio_open(&ofc->pb, filename, URL_WRONLY) < 0 )/ s/URL_WRONLY/AVIO_FLAG_WRITE/;
+#    s/av_write_header(ofc);/avformat_write_header(ofc, NULL);/'\
+#    src/zm_mpeg.cpp
+  sed -i -e 's/avcodec_init/avcodec_open/'\
+    configure{,.ac}
+
+  # Patch for support ffmpeg with <libavutil/mathematics.h> and C library
+  sed -i -e 's/^extern "C" {/extern "C" {\n#ifdef _STDINT_H\n#undef _STDINT_H\n#endif\n#include <stdint.h>/
+    s/^#include <libavutil\/avutil.h>/#include <libavutil\/avutil.h>\n#include <libavutil\/mathematics.h>/'\
+    src/zm_ffmpeg.h
+  sed -i -e 's/^AM_CONFIG_HEADER(config.h)/AM_CONFIG_HEADER(config.h)\n\nAC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])/;
+    s/^AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)/AC_CHECK_HEADERS(mysql\/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)\nAC_LANG_PUSH([C])/;
+    s/^AC_CHECK_HEADERS(libswscale\/swscale.h,,,)/AC_CHECK_HEADERS(libswscale\/swscale.h,,,)\nAC_LANG_POP([C])/'\
+    configure.ac
+
+  # Patch for wrong install run, tmp and log dir
+  sed -i -e '/ install-data-hook/d;/install-data-hook:/d;/# Yes, you are correct. This is a HACK!/d;
+    /	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )/d;
+    /	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "\/var\/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )/d;
+    /	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "\/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )/d;
+    /	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "\/var\/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )/,+1 d' \
+    Makefile.{am,in}
 
   ./configure --prefix=/usr \
     --build \
-    --enable-crashtrace=yes \
-    --enable-debug=yes \
+    --enable-crashtrace=no \
+    --enable-debug=no \
     --enable-mmap=yes \
-    --mandir=/usr/share/man \
     --sysconfdir=/etc \
     --with-cgidir=/usr/lib/$pkgname/cgi-bin \
     --with-ffmpeg=/usr \
     --with-libarch=lib \
     --with-mysql=/usr \
-    --with-webdir=/usr/share/$pkgname \
+    --with-webdir=/usr/share/$pkgname/www \
     --with-webgroup=http \
+    --with-webhost=localhost \
     --with-webuser=http
+
   make V=0
 }
 
 package() {
   cd $srcdir/ZoneMinder-$pkgver
 
-  make DESTDIR=$pkgdir \
-    ZM_LOGDIR=$pkgdir/var/log/zm \
-    ZM_RUNDIR=$pkgdir/run \
-    ZM_TMPDIR=$pkgdir/tmp \
-    install
+  make DESTDIR=$pkgdir install
 
-  rmdir $pkgdir/run
-  rmdir $pkgdir/tmp
+  mkdir -p $pkgdir/{etc/{httpd/conf/extra,rc.d},usr/{lib/{systemd/system,$pkgname/cgi-bin},share/{license/$pkgname,$pkgname/{db,www}}},var/{cache/$pkgname,log/zm}}
 
-  mkdir -p $pkgdir/etc/httpd/conf/extra
-  mkdir -p $pkgdir/etc/rc.d
-  mkdir -p $pkgdir/usr/lib/systemd/system
-  mkdir -p $pkgdir/usr/share/license/$pkgname
-  mkdir -p $pkgdir/usr/share/$pkgname/db
-  mkdir -p $pkgdir/var/cache/$pkgname
+  chown -R http.http $pkgdir/{etc/zm.conf,var/{cache/$pkgname,log/zm}}
 
   for i in events images temp; do
-    mv    $pkgdir/usr/share/$pkgname/$i $pkgdir/var/cache/$pkgname/$i
-    ln -s /var/cache/$pkgname/$i        $pkgdir/usr/share/$pkgname/$i
+    mv    $pkgdir/usr/share/$pkgname/www/$i $pkgdir/var/cache/$pkgname/$i
+    ln -s /var/cache/$pkgname/$i            $pkgdir/usr/share/$pkgname/www/$i
   done
 
-  ln -s /usr/lib/$pkgname/cgi-bin          $pkgdir/usr/share/$pkgname
-  ln -s /usr/share/cambozola/cambozola.jar $pkgdir/usr/share/$pkgname
-
-  chown    http.http $pkgdir/etc/zm.conf
-  chown -R http.http $pkgdir/var/cache/$pkgname
-  chown    http.http $pkgdir/var/log/zm
+  ln -s /usr/lib/$pkgname/cgi-bin          $pkgdir/usr/share/$pkgname/www
+  ln -s /usr/share/cambozola/cambozola.jar $pkgdir/usr/share/$pkgname/www
 
   install -D -m 644 $srcdir/httpd-zm.conf    $pkgdir/etc/httpd/conf/extra
   install -D -m 644 $srcdir/zm.rc.d          $pkgdir/etc/rc.d/zm
diff --git a/pcr/zoneminder/httpd-zm.conf b/pcr/zoneminder/httpd-zm.conf
index e48ea9fc6..8c6356aec 100644
--- a/pcr/zoneminder/httpd-zm.conf
+++ b/pcr/zoneminder/httpd-zm.conf
@@ -1,20 +1,20 @@
 # /etc/httpd/conf/extra/httpd-zm.conf
 # Config for zoneminder web app
 
-Alias /zm "/usr/share/zoneminder"
-<Directory "/usr/share/zoneminder">
+Alias /zm "/usr/share/zoneminder/www"
+<Directory "/usr/share/zoneminder/www">
   Options -Indexes MultiViews FollowSymLinks
-  AllowOverride All
+  AllowOverride None
   Order allow,deny
   Allow from all
   # The code unfortunately uses short tags in many places
-  php_value short_open_tag 1
+  php_value short_open_tag On
 </Directory>
 
 ScriptAlias /zm/cgi-bin "/usr/lib/zoneminder/cgi-bin"
 <Directory "/usr/lib/zoneminder/cgi-bin">
-    AllowOverride All
-    Options ExecCGI
-    Order allow,deny
-    Allow from all
+  AllowOverride None
+  Options ExecCGI FollowSymLinks
+  Order allow,deny
+  Allow from all
 </Directory>
diff --git a/pcr/zoneminder/patch-ffmpeg-configure.patch b/pcr/zoneminder/patch-ffmpeg-configure.patch
new file mode 100644
index 000000000..ba1674a4a
--- /dev/null
+++ b/pcr/zoneminder/patch-ffmpeg-configure.patch
@@ -0,0 +1,26 @@
+--- configure.old	2011-08-23 12:10:37.000000000 -0300
++++ configure		2012-09-26 16:23:33.211940267 -0300
+@@ -3026,8 +3026,8 @@
+ fi
+ 
+ 
+-FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}"
+-FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include"
++FFMPEG_LIBS=`pkg-config --cflags libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale`
++FFMPEG_CFLAGS=`pkg-config --cflags libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale`
+ 
+ 
+ 
+--- configure.ac.old	2011-08-23 12:10:32.000000000 -0300
++++ configure.ac	2012-09-26 18:16:44.146848335 -0300
+@@ -88,8 +88,8 @@
+     e.g. --with-ffmpeg=/usr/local])
+ )
+ AC_SUBST(FFMPEG_PREFIX)
+-FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}"
+-FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include"
++FFMPEG_LIBS=`pkg-config --libs libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale`
++FFMPEG_CFLAGS=`pkg-config --libs libavcodec libavdevice libavfilter libavformat libavutil libpostproc libswscale`
+ AC_SUBST(FFMPEG_LIBS)
+ AC_SUBST(FFMPEG_CFLAGS)
+ 
diff --git a/pcr/zoneminder/zoneminder.install b/pcr/zoneminder/zoneminder.install
index 3ade5355e..922aaad9b 100644
--- a/pcr/zoneminder/zoneminder.install
+++ b/pcr/zoneminder/zoneminder.install
@@ -1,14 +1,14 @@
 pre_install() {
   set -e
   abort=false
-  if [ -L /usr/share/zoneminder/events ]; then
-    l=$(readlink /usr/share/zoneminder/events)
+  if [ -L /usr/share/zoneminder/www/events ]; then
+    l=$(readlink /usr/share/zoneminder/www/events)
     if [ $l != /var/cache/zoneminder/events ]; then
         abort=true
     fi
   fi
-  if [ -L /usr/share/zoneminder/images ]; then
-    l=$(readlink /usr/share/zoneminder/images )
+  if [ -L /usr/share/zoneminder/www/images ]; then
+    l=$(readlink /usr/share/zoneminder/www/images )
     if [ $l != /var/cache/zoneminder/images ]; then
         abort=true
     fi
@@ -16,7 +16,7 @@ pre_install() {
   if [ $abort = true ]; then
     cat >&2 << EOF
 Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder for the images and/or events directory, which could
+/usr/share/zoneminder/www for the images and/or events directory, which could
 result in loss of data. Please move your data in each of these directories to
 /var/cache/zoneminder before installing zoneminder from the package.
 EOF
@@ -26,18 +26,16 @@ EOF
 }
 
 post_install() {
-  mkdir /usr/share/zoneminder/backup
-  mkdir /usr/share/zoneminder/socks
+  mkdir /usr/share/zoneminder/www/backup
+  mkdir /usr/share/zoneminder/www/socks
   cat << EOF
 Note:
 ==> To run Zoneminder, you must install the database running mysql service (as root):
 ==> "rc.d start mysqld" (in initscripts) or "systemctl start mysqld.service" (in systemd)
 ==> and add Zoneminder database typing:
-==> mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload
-==> cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p
-==> echo 'grant lock tables, alter,select,insert,update,delete on zm.*'"\
-==> "' to 'zmuser'@localhost identified by "zmpass";' |
-==> mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
+==> "mysqladmin --defaults-file=/etc/mysql/my.cnf -p -f reload"
+==> "cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/my.cnf -p"
+==> "echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/my.cnf -p mysql"
 
 Note:
 ==> You must uncomment that line in /etc/php/php.ini:
@@ -50,20 +48,18 @@ Note:
 ==> "extension=session.so"
 ==> "extension=sockets.so"
 
-==> Check /etc/php/php.ini and make sure short_open_tag = On
-==> or ZoneMinder will not work.
-
 ==> You must edit /etc/php/php.ini and add to open_basedir "/etc" and
 ==> "/usr/share/zoneminder" like so
-==> open_basedir = /home:/tmp:/usr/share/pear:/etc:/usr/share/zoneminder
+==> "open_basedir = /home:/tmp:/usr/share/pear:/etc:/usr/share/zoneminder/www"
 ==> Otherwise ZoneMinder will be unable to read /etc/zm.conf
 ==> or display its own web directory
 
 Note:
 ==> You must edit /etc/httpd/conf/httpd.conf and add the line:
-==> LoadModule php5_module modules/libphp5.so
+==> "LoadModule php5_module modules/libphp5.so"
 ==> and:
-==> Include /etc/httpd/conf/extra/httpd-zm.conf
+==> "Include /etc/httpd/conf/extra/php5_module.conf"
+==> "Include /etc/httpd/conf/extra/httpd-zm.conf"
 EOF
 }
 
@@ -82,6 +78,7 @@ Note:
 ==> Disable http with php if it isn't needed with others servers, 
 ==> comment or remove that lines in /etc/httpd/conf/httpd.conf:
 ==> "LoadModule php5_module modules/libphp5.so"
+==> "Include /etc/httpd/conf/extra/php5_module.conf"
 ==> "Include /etc/httpd/conf/extra/httpd-zm.conf"
 
 ==> Disable php with mysql if it isn't needed with others servers, 
@@ -94,7 +91,7 @@ Note:
 ==> "extension=session.so"
 ==> "extension=sockets.so"
 
-==> edit /etc/php/php.ini and remove "/etc" and "/usr/share/zoneminder"
+==> edit /etc/php/php.ini and remove "/etc" and "/usr/share/zoneminder/www"
 ==> in the open_basedir.
 EOF
 }
diff --git a/social/netatalk/PKGBUILD b/social/netatalk/PKGBUILD
index 98e64982d..7e2fe14aa 100644
--- a/social/netatalk/PKGBUILD
+++ b/social/netatalk/PKGBUILD
@@ -6,8 +6,8 @@
 # Contributor: Farhan Yousaf <farhany at xaviya dot com>
 
 pkgname=netatalk
-pkgver=3.0
-pkgrel=4
+pkgver=3.0.1
+pkgrel=1
 pkgdesc='Open Source AFP fileserver'
 arch=('i686' 'x86_64')
 url='http://netatalk.sourceforge.net'
@@ -54,3 +54,5 @@ package() {
 	msg2 'Copying initscripts...'
 	install -D -m755 "$srcdir"/netatalk.rc "$pkgdir"/etc/rc.d/netatalk
 }
+md5sums=('5e92015b0d9ac77af4b598cca6cb435c'
+         'b4f5c932b2ca99f5292bd6b6d69b3ebc')
author	Luke Shumaker <LukeShu@sbcglobal.net>	2012-10-09 21:55:49 -0400
committer	Luke Shumaker <LukeShu@sbcglobal.net>	2012-10-09 21:55:49 -0400
commit	42a5749cf083ca141ea356263cf5ad0000f5da12 (patch)
tree	5dd2824f43e6c2af95281af174c7e8c1cb7b29b7
parent	ad1725db924d8330ec3c9cd738f214f51fbc4504 (diff)
parent	533189fa3e72bb81b1904365f40d8fbd4ef78690 (diff)