=== modified file 'plugins.d/password-prompt.c'
--- plugins.d/password-prompt.c	2009-10-24 19:17:52 +0000
+++ plugins.d/password-prompt.c	2009-10-30 16:23:43 +0000
@@ -258,22 +258,31 @@
       fprintf(stderr, "%s ", prefix);
     }
     {
-      const char *cryptsource = getenv("cryptsource");
-      const char *crypttarget = getenv("crypttarget");
-      const char *const prompt
-	= "Enter passphrase to unlock the disk";
+      const char *cryptsource = getenv("CRYPTTAB_SOURCE");
+      const char *crypttarget = getenv("CRYPTTAB_NAME");
+      /* Before cryptsetup 1.1.0~rc2 */
+      if(cryptsource == NULL){
+	cryptsource = getenv("cryptsource");
+      }
+      if(crypttarget == NULL){
+	crypttarget = getenv("crypttarget");
+      }
+      const char *const prompt1 = "Unlocking the disk";
+      const char *const prompt2 = "Enter passphrase";
       if(cryptsource == NULL){
 	if(crypttarget == NULL){
-	  fprintf(stderr, "%s: ", prompt);
+	  fprintf(stderr, "%s to unlock the disk: ", prompt2);
 	} else {
-	  fprintf(stderr, "%s (%s): ", prompt, crypttarget);
+	  fprintf(stderr, "%s (%s)\n%s: ", prompt1, crypttarget,
+		  prompt2);
 	}
       } else {
 	if(crypttarget == NULL){
-	  fprintf(stderr, "%s %s: ", prompt, cryptsource);
+	  fprintf(stderr, "%s %s\n%s: ", prompt1, cryptsource,
+		  prompt2);
 	} else {
-	  fprintf(stderr, "%s %s (%s): ", prompt, cryptsource,
-		  crypttarget);
+	  fprintf(stderr, "%s %s (%s)\n%s: ", prompt1, cryptsource,
+		  crypttarget, prompt2);
 	}
       }
     }

=== modified file 'plugins.d/password-prompt.xml'
--- plugins.d/password-prompt.xml	2009-01-04 21:54:55 +0000
+++ plugins.d/password-prompt.xml	2009-10-30 16:23:43 +0000
@@ -2,7 +2,7 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 <!ENTITY COMMANDNAME "password-prompt">
-<!ENTITY TIMESTAMP "2009-01-04">
+<!ENTITY TIMESTAMP "2009-10-30">
 <!ENTITY % common SYSTEM "../common.ent">
 %common;
 ]>
@@ -183,8 +183,8 @@
     <title>ENVIRONMENT</title>
     <variablelist>
       <varlistentry>
-	<term><envar>cryptsource</envar></term>
-	<term><envar>crypttarget</envar></term>
+	<term><envar>CRYPTTAB_SOURCE</envar></term>
+	<term><envar>CRYPTTAB_NAME</envar></term>
 	<listitem>
 	  <para>
 	    If set, these environment variables will be assumed to