diff --git a/cernvm/amiconfig/plugins/cernvm.py b/cernvm/amiconfig/plugins/cernvm.py
index dea900c..e74ee5b 100644
--- a/cernvm/amiconfig/plugins/cernvm.py
+++ b/cernvm/amiconfig/plugins/cernvm.py
@@ -105,6 +105,8 @@ def configure(self):
         keyboard = us
         # GRID UI version
         gridUiVersion = default
+        # Either fixed size (1g, 2g, ...) or auto, meaning 2g/core.  Default is no swap.
+        swap_size = off
         """
 
         cfg = self.ud.getSection('cernvm')
@@ -261,6 +263,12 @@ def configure(self):
             "/etc/cernvm/site.conf",
             'CERNVM_AUTOLOGIN',autoLogin,"=")
 
+        if 'swap_size' in cfg:
+            swapSize = cfg['swap_size']
+            self.writeConfigToFile(
+              "/etc/cernvm/site.conf",
+              'CERNVM_SWAP_SIZE', swapSize, "=")
+
         if 'desktop_icons' in cfg:
             desktopIcons = cfg['desktop_icons']
             self.writeConfigToFile(