diff -Nru ecryptfs-utils-96/debian/changelog ecryptfs-utils-96/debian/changelog
--- ecryptfs-utils-96/debian/changelog	2012-02-22 01:50:01.000000000 +0000
+++ ecryptfs-utils-96/debian/changelog	2012-04-18 14:52:47.000000000 +0000
@@ -1,3 +1,10 @@
+ecryptfs-utils (96-0ubuntu3) precise; urgency=low
+
+  * src/utils/ecryptfs-setup-swap: Skip /dev/zram* swap devices
+    (LP: #979350).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Wed, 18 Apr 2012 15:52:45 +0100
+
 ecryptfs-utils (96-0ubuntu2) precise; urgency=low
 
   * Add debian/patches/automount-fork-exit.patch (LP: #938326).
diff -Nru ecryptfs-utils-96/debian/patches/series ecryptfs-utils-96/debian/patches/series
--- ecryptfs-utils-96/debian/patches/series	2012-02-22 01:46:32.000000000 +0000
+++ ecryptfs-utils-96/debian/patches/series	2012-04-18 14:49:41.000000000 +0000
@@ -1 +1,2 @@
 automount-fork-exit.patch
+setup-swap-skip-zram.patch
diff -Nru ecryptfs-utils-96/debian/patches/setup-swap-skip-zram.patch ecryptfs-utils-96/debian/patches/setup-swap-skip-zram.patch
--- ecryptfs-utils-96/debian/patches/setup-swap-skip-zram.patch	1970-01-01 00:00:00.000000000 +0000
+++ ecryptfs-utils-96/debian/patches/setup-swap-skip-zram.patch	2012-04-18 14:52:12.000000000 +0000
@@ -0,0 +1,19 @@
+Description: Skip /dev/zram* swap devices
+Author: Colin Watson <cjwatson@ubuntu.com>
+Forwarded: no
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/979350
+Last-Update: 2012-04-18
+
+Index: b/src/utils/ecryptfs-setup-swap
+===================================================================
+--- a/src/utils/ecryptfs-setup-swap
++++ b/src/utils/ecryptfs-setup-swap
+@@ -92,7 +92,7 @@
+ 		continue
+ 	fi
+ 	
+-	if [ "${swap#/dev/ram}" != "$swap" ]; then
++	if [ "${swap#/dev/ram}" != "$swap" ] || [ "${swap#/dev/zram}" != "$swap" ]; then
+ 		warn "[$swap]" `gettext "is a RAM device, skipping."`
+ 		continue
+ 	fi