diff -rau gnome-mount-0.5/src/gnome-mount.c gnome-mount-0.5-crypto_keyfile/src/gnome-mount.c
--- gnome-mount-0.5/src/gnome-mount.c	2006-09-17 06:17:54.000000000 +0100
+++ gnome-mount-0.5-crypto_keyfile/src/gnome-mount.c	2007-08-19 23:23:09.000000000 +0100
@@ -2883,6 +2883,11 @@
 			/* we need to catch this if the backing device is removed (to remove the password dialog) */
 			libhal_ctx_set_device_removed (hal_ctx, crypto_setup_device_removed);
 
+#ifdef CRYPTO_KEYFILE
+			password = "";
+			setup_success = setup_crypto (udi, volume, drive, password, &password_error);
+			if (setup_success) goto mounted_crypto;
+#endif
 			password_retry = FALSE;
 			password_num_tries = 0;
 		retry_password:			
@@ -2902,6 +2907,9 @@
 				}
 			}
 
+#ifdef CRYPTO_KEYFILE			
+		mounted_crypto:
+#endif
 			/* mount the clear volume except if --connect-crypto was explicitly passed */
 			if (setup_success && !opt_connect_crypto) {
 				
diff -rau gnome-mount-0.5/src/Makefile.am gnome-mount-0.5-crypto_keyfile/src/Makefile.am
--- gnome-mount-0.5/src/Makefile.am	2006-09-14 03:17:08.000000000 +0100
+++ gnome-mount-0.5-crypto_keyfile/src/Makefile.am	2007-08-19 23:21:23.000000000 +0100
@@ -1,5 +1,6 @@
 
 INCLUDES = 					   \
+	-DCRYPTO_KEYFILE			   \
 	$(GNOME_MOUNT_PROPERTIES_CFLAGS)	   \
 	$(GNOME_MOUNT_CFLAGS)			   \
 	$(NAUTILUS_CFLAGS)			   \