diff --git a/config/functions b/config/functions
index e294402806..d1b71b7519 100644
--- a/config/functions
+++ b/config/functions
@@ -329,6 +329,10 @@ show_config() {
   config_message="$config_message\n\n Misc. Filesystems:"
   config_message="$config_message\n $dashes$dashes"
 
+  config_message="$config_message\n - Swap Support:\t\t\t $SWAP_SUPPORT"
+if [ "$SWAP_SUPPORT" = "yes" ]; then
+  config_message="$config_message\n - Swapfile default size:\t\t $SWAPFILESIZE"
+fi
   config_message="$config_message\n - NTFS Support (via Fuse):\t\t $NTFS3G"
   config_message="$config_message\n - Install HFS Tools:\t\t\t $HFSTOOLS"
 
diff --git a/packages/linux/unpack b/packages/linux/unpack
index 41b5e4f320..e9cde0ae7b 100755
--- a/packages/linux/unpack
+++ b/packages/linux/unpack
@@ -47,6 +47,11 @@ sed -i -e "s|^CONFIG_INITRAMFS_SOURCE=.*$|CONFIG_INITRAMFS_SOURCE=\"$ROOT/$BUILD
     sed -i -e "s|^CONFIG_VIDEO_DEV=.*$|# CONFIG_VIDEO_DEV is not set|" $LINUX/.config
   fi
 
+# disable swap support if not enabled
+  if [ ! "$SWAP_SUPPORT" = yes ]; then
+    sed -i -e "s|^CONFIG_SWAP=.*$|# CONFIG_SWAP is not set|" $LINUX/.config
+  fi
+
 # dont install some debug stuff on release builds
   if [ ! "$DEVTOOLS" = yes ]; then
     sed -i -e "s|^CONFIG_DEBUG_FS=.*$|# CONFIG_DEBUG_FS is not set|" $LINUX/.config
diff --git a/packages/sysutils/util-linux/config/swap.conf b/packages/sysutils/util-linux/config/swap.conf
new file mode 100644
index 0000000000..04babc5860
--- /dev/null
+++ b/packages/sysutils/util-linux/config/swap.conf
@@ -0,0 +1,22 @@
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+SWAPFILE="$HOME/.cache/swapfile"
+SWAPFILESIZE="@SWAPFILESIZE@"
diff --git a/packages/sysutils/util-linux/install b/packages/sysutils/util-linux/install
index c995eb7152..02600174f0 100755
--- a/packages/sysutils/util-linux/install
+++ b/packages/sysutils/util-linux/install
@@ -25,8 +25,6 @@
 mkdir -p $INSTALL/usr/bin
   cp $PKG_BUILD/misc-utils/.libs/blkid $INSTALL/usr/bin
   cp $PKG_BUILD/sys-utils/fstrim $INSTALL/usr/bin
-  cp $PKG_BUILD/sys-utils/.libs/swapon $INSTALL/usr/bin
-    ln -sf swapon $INSTALL/usr/bin/swapoff
   cp $PKG_BUILD/fsck/.libs/fsck $INSTALL/usr/bin
 
 mkdir -p $INSTALL/usr/lib
@@ -34,3 +32,15 @@ mkdir -p $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libblkid.so*T
   cp -PR $PKG_BUILD/libuuid/src/.libs/libuuid.so* $INSTALL/usr/lib
   rm -rf $INSTALL/usr/lib/libuuid.so*T
+
+if [ "$SWAP_SUPPORT" = "yes" ]; then
+  mkdir -p $INSTALL/usr/bin
+  cp $PKG_BUILD/sys-utils/.libs/swapon $INSTALL/usr/bin
+  ln -sf swapon $INSTALL/usr/bin/swapoff
+
+  mkdir -p $INSTALL/etc/init.d
+  cp $PKG_DIR/scripts/32_swapfile $INSTALL/etc/init.d
+
+  mkdir -p $INSTALL/etc
+  cat $PKG_DIR/config/swap.conf | sed -e "s,@SWAPFILESIZE@,$SWAPFILESIZE,g" > $INSTALL/etc/swap.conf
+fi
diff --git a/packages/sysutils/util-linux/init.d/32_swapfile b/packages/sysutils/util-linux/scripts/32_swapfile
similarity index 76%
rename from packages/sysutils/util-linux/init.d/32_swapfile
rename to packages/sysutils/util-linux/scripts/32_swapfile
index 8a9d18c6d7..0a21f425d0 100644
--- a/packages/sysutils/util-linux/init.d/32_swapfile
+++ b/packages/sysutils/util-linux/scripts/32_swapfile
@@ -1,6 +1,6 @@
 ################################################################################
-#      Copyright (C) 2009-2010 OpenELEC.tv
-#      http://www.openelec.tv
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
 #
 #  This Program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -23,16 +23,20 @@
 #
 # runlevels: openelec, textmode
 
-(
-  INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'`
-  SWAP=`blkid -t TYPE="swap" -o device`
-  SWAPFILE="$HOME/.cache/swapfile"
+. /etc/swap.conf
+
+if [ -f $HOME/.config/swap.conf ]; then
+  . $HOME/.config/swap.conf
+fi
+
+(
+  if [ -e /proc/swaps ]; then
+    SWAP=`blkid -t TYPE="swap" -o device`
 
-  if [ "$INSTALLED_MEMORY" -le "500000" ]; then
     if [ -z "$SWAP" -a ! -f "$SWAPFILE" ]; then
       progress "creating swapfile"
-      mkdir -p $HOME/.cache
-      dd if=/dev/zero of=$SWAPFILE bs=1024 count=262144 2>&1 > /dev/null
+      mkdir -p `dirname $SWAPFILE`
+      dd if=/dev/zero of=$SWAPFILE bs=1024 count=$SWAPFILESIZE 2>&1 > /dev/null
       mkswap $SWAPFILE 2>&1 > /dev/null
     fi
 
diff --git a/projects/ATV/options b/projects/ATV/options
index 5060e84fe5..493092f312 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -267,7 +267,7 @@
 
 # build and install CEC adapter support (yes / no)
   CEC_SUPPORT="yes"
-  
+
 # build and install iSCSI support - iscsistart (yes / no)
   ISCSI_SUPPORT="yes"
 
@@ -298,6 +298,12 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
+# build with swap support (yes / no)
+  SWAP_SUPPORT="yes"
+
+# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
+  SWAPFILESIZE="262144"
+
 # build with automatic update support (yes / no)
   UPDATE_SUPPORT="yes"
 
diff --git a/projects/Fusion/linux/linux.i386.conf b/projects/Fusion/linux/linux.i386.conf
index 9fa24fe400..b6735e12d5 100644
--- a/projects/Fusion/linux/linux.i386.conf
+++ b/projects/Fusion/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.16 Kernel Configuration
+# Linux/i386 3.2.17 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -71,7 +71,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -428,6 +428,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/Fusion/linux/linux.x86_64.conf b/projects/Fusion/linux/linux.x86_64.conf
index 6a2a60c104..ca58547b3c 100644
--- a/projects/Fusion/linux/linux.x86_64.conf
+++ b/projects/Fusion/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.16 Kernel Configuration
+# Linux/x86_64 3.2.17 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -73,7 +73,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -397,6 +397,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/Fusion/options b/projects/Fusion/options
index 638a1cb286..350ade9091 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -297,6 +297,12 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
+# build with swap support (yes / no)
+  SWAP_SUPPORT="no"
+
+# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
+  SWAPFILESIZE="262144"
+
 # build with automatic update support (yes / no)
   UPDATE_SUPPORT="yes"
 
diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index 2825cc33ea..94ed04abf9 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.16 Kernel Configuration
+# Linux/i386 3.2.17 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -71,7 +71,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -430,6 +430,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/Generic/options b/projects/Generic/options
index f37df05125..4254862de0 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -297,6 +297,12 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
+# build with swap support (yes / no)
+  SWAP_SUPPORT="no"
+
+# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
+  SWAPFILESIZE="262144"
+
 # build with automatic update support (yes / no)
   UPDATE_SUPPORT="yes"
 
diff --git a/projects/Generic_OSS/linux/linux.i386.conf b/projects/Generic_OSS/linux/linux.i386.conf
index ac79d6d6af..d718ecdd4a 100644
--- a/projects/Generic_OSS/linux/linux.i386.conf
+++ b/projects/Generic_OSS/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.16 Kernel Configuration
+# Linux/i386 3.2.17 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -71,7 +71,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -430,6 +430,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 7effc8284e..6129e8ef72 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -297,6 +297,12 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
+# build with swap support (yes / no)
+  SWAP_SUPPORT="no"
+
+# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
+  SWAPFILESIZE="262144"
+
 # build with automatic update support (yes / no)
   UPDATE_SUPPORT="yes"
 
diff --git a/projects/ION/linux/linux.i386.conf b/projects/ION/linux/linux.i386.conf
index 18a21519cf..0e56d98421 100644
--- a/projects/ION/linux/linux.i386.conf
+++ b/projects/ION/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.16 Kernel Configuration
+# Linux/i386 3.2.17 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -71,7 +71,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -425,6 +425,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/ION/linux/linux.x86_64.conf b/projects/ION/linux/linux.x86_64.conf
index 0b0005530b..475147e74f 100644
--- a/projects/ION/linux/linux.x86_64.conf
+++ b/projects/ION/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.16 Kernel Configuration
+# Linux/x86_64 3.2.17 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -73,7 +73,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -389,6 +389,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/ION/options b/projects/ION/options
index ce94c7c6bc..76ae65c5cc 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -297,6 +297,12 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
+# build with swap support (yes / no)
+  SWAP_SUPPORT="no"
+
+# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
+  SWAPFILESIZE="262144"
+
 # build with automatic update support (yes / no)
   UPDATE_SUPPORT="yes"
 
diff --git a/projects/Intel/linux/linux.i386.conf b/projects/Intel/linux/linux.i386.conf
index d40f8941f4..a1ccc59848 100644
--- a/projects/Intel/linux/linux.i386.conf
+++ b/projects/Intel/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.16 Kernel Configuration
+# Linux/i386 3.2.17 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -71,7 +71,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -426,6 +426,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/Intel/linux/linux.x86_64.conf b/projects/Intel/linux/linux.x86_64.conf
index 5213639b5d..1c36365cdc 100644
--- a/projects/Intel/linux/linux.x86_64.conf
+++ b/projects/Intel/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.16 Kernel Configuration
+# Linux/x86_64 3.2.17 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -73,7 +73,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -391,6 +391,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/Intel/options b/projects/Intel/options
index c26199ed6f..f9080720f2 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -297,6 +297,12 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
+# build with swap support (yes / no)
+  SWAP_SUPPORT="no"
+
+# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
+  SWAPFILESIZE="262144"
+
 # build with automatic update support (yes / no)
   UPDATE_SUPPORT="yes"
 
diff --git a/projects/RPi/options b/projects/RPi/options
index b3b069ec9a..cf5ce741e8 100755
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -301,6 +301,12 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
+# build with swap support (yes / no)
+  SWAP_SUPPORT="no"
+
+# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
+  SWAPFILESIZE="262144"
+
 # build with automatic update support (yes / no)
   UPDATE_SUPPORT="yes"
 
diff --git a/projects/Ultra/linux/linux.x86_64.conf b/projects/Ultra/linux/linux.x86_64.conf
index 62f7491cda..0777880e7d 100644
--- a/projects/Ultra/linux/linux.x86_64.conf
+++ b/projects/Ultra/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.15 Kernel Configuration
+# Linux/x86_64 3.2.17 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -73,7 +73,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -389,6 +389,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/Ultra/options b/projects/Ultra/options
index 53186a911a..3ab1ee6cf7 100755
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -297,6 +297,12 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
+# build with swap support (yes / no)
+  SWAP_SUPPORT="no"
+
+# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
+  SWAPFILESIZE="262144"
+
 # build with automatic update support (yes / no)
   UPDATE_SUPPORT="yes"
 
diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf
index 745781828a..01a2882ff0 100644
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.16 Kernel Configuration
+# Linux/i386 3.2.17 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -71,7 +71,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -424,6 +424,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf
index bc7304dc14..0e9491cea1 100644
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.16 Kernel Configuration
+# Linux/x86_64 3.2.17 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set
@@ -73,7 +73,7 @@ CONFIG_HAVE_KERNEL_LZO=y
 CONFIG_KERNEL_XZ=y
 # CONFIG_KERNEL_LZO is not set
 CONFIG_DEFAULT_HOSTNAME="openelec"
-# CONFIG_SWAP is not set
+CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
 CONFIG_POSIX_MQUEUE=y
@@ -388,6 +388,7 @@ CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 #
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
+# CONFIG_HIBERNATION is not set
 CONFIG_PM_SLEEP=y
 CONFIG_PM_SLEEP_SMP=y
 CONFIG_PM_RUNTIME=y
diff --git a/projects/Virtual/options b/projects/Virtual/options
index cc1c75b31f..b409cc812d 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -293,6 +293,12 @@
 # build with lm_sensors hardware monitoring support (yes / no)
   SENSOR_SUPPORT="yes"
 
+# build with swap support (yes / no)
+  SWAP_SUPPORT="no"
+
+# swapfile size if SWAP_SUPPORT=yes in kB (example: 262144 = 256MB )
+  SWAPFILESIZE="262144"
+
 # build with automatic update support (yes / no)
   UPDATE_SUPPORT="yes"