diff --git a/mkinitrd/etc/mkinitrd.conf.sample b/mkinitrd/etc/mkinitrd.conf.sample
index 70256ef..187ac29 100644
--- a/mkinitrd/etc/mkinitrd.conf.sample
+++ b/mkinitrd/etc/mkinitrd.conf.sample
@@ -13,6 +13,7 @@
 #ROOTDEV="/dev/sda1"
 #ROOTFS="ext4"
 #RESUMEDEV="/dev/sda2"
+#RESUMEOFF="0"
 #RAID="0"
 #LVM="0"
 #UDEV="1"
diff --git a/mkinitrd/sbin/mkinitrd b/mkinitrd/sbin/mkinitrd
index bca7e29..ea45b09 100755
--- a/mkinitrd/sbin/mkinitrd
+++ b/mkinitrd/sbin/mkinitrd
@@ -527,6 +527,11 @@ if [ ! -z "$RESUMEDEV" ]; then
   echo $RESUMEDEV > $SOURCE_TREE/resumedev
 fi
 
+# Fill /resumeoff with the swap file offset within partition holding the hibernation image
+if [ ! -z "$RESUMEOFF" ]; then
+  echo $RESUMEOFF > $SOURCE_TREE/resumeoff
+fi
+
 # Add custom keymap support if one was given
 if [ ! -z "$KEYMAP" ]; then
   echo $KEYMAP > $SOURCE_TREE/keymap
diff --git a/mkinitrd/usr/share/mkinitrd/init b/mkinitrd/usr/share/mkinitrd/init
index f193f60..7a0ceb0 100755
--- a/mkinitrd/usr/share/mkinitrd/init
+++ b/mkinitrd/usr/share/mkinitrd/init
@@ -80,6 +80,7 @@ LUKSDEV=$(cat /luksdev)
 LUKSTRIM=$(cat /lukstrim 2>/dev/null)
 LUKSKEY=$(cat /lukskey)
 RESUMEDEV=$(cat /resumedev)
+RESUMEOFF=$(cat /resumeoff)
 WAIT=$(cat /wait-for-root)
 KEYMAP=$(cat /keymap)
 INIT=/sbin/init
@@ -117,6 +118,9 @@ for ARG in $(cat /proc/cmdline); do
     resume=*)
       RESUMEDEV=$(echo $ARG | cut -f2- -d=)
     ;;
+    resume_offset=*)
+      RESUMEOFF=$(echo $ARG | cut -f2- -d=)
+    ;;
     root=/dev/*)
       ROOTDEV=$(echo $ARG | cut -f2 -d=)
     ;;
@@ -314,7 +318,10 @@ if [ "$RESCUE" = "" ]; then
     elif ls -l $RESUMEDEV | grep -q "^l" ; then
       RESUMEDEV=$(readlink -f $RESUMEDEV)
     fi
-    echo "Trying to resume from $RESUMEDEV"
+    echo "Trying to resume from $RESUMEDEV${RESUMEOFF:+,$RESUMEOFF}"
+    if [ "$RESUMEOFF" != "" ]; then
+        echo $RESUMEOFF >/sys/power/resume_offset
+    fi
     RESMAJMIN=$(ls -l $RESUMEDEV | tr , : | awk '{ print $5$6 }')
     echo $RESMAJMIN > /sys/power/resume
   fi

diff --git a/swap-offset.c b/swap-offset.c
index 79aeef7..8d4e49b 100644
--- a/swap-offset.c
+++ b/swap-offset.c
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
                err = EINVAL;
        } else {
                offset = (unsigned long long)first_block * blk_size / page_size;
-               printf("resume offset = %u\n", offset);
+               printf("%u\n", offset);
        }
 
 out:

$ make swap-offset[/i]