--- s2ram-main.c.orig	2010-01-01 19:13:34.000000000 +0100
+++ s2ram-main.c	2010-01-01 19:22:36.000000000 +0100
@@ -2,6 +2,7 @@
  * Suspend-to-RAM
  *
  * Copyright 2006 Pavel Machek <pavel@suse.cz>
+ * Some changes from kix <kix@kix.es>, 12/2009
  * Distribute under GPLv2.
  */
 
@@ -86,11 +87,11 @@
 
 	/* switch to console 1 first, since we might be in X */
 	active_console = fgconsole();
-	printf("Switching from vt%d to vt1", active_console);
+	printf("switching from vt%d to vt1... ", active_console);
 	if (chvt(1))
-		printf("... succeeded\n");
+		printf("succeeded\n");
 	else
-		printf("... failed\n");
+		printf("failed\n");
 
 
 	ret = s2ram_hacks();
@@ -102,11 +103,11 @@
  out:
 	/* if we switched consoles before suspend, switch back */
 	if (active_console > 0) {
-		printf("switching back to vt%d", active_console);
+		printf("switching back to vt%d... ", active_console);
 		if (chvt(active_console))
-			printf("... succeeded\n");
+			printf("succeeded\n");
 		else
-			printf("... failed\n");
+			printf("failed\n");
 	}
 
 	return ret;
--- s2ram-x86.c.orig	2010-01-01 19:13:44.000000000 +0100
+++ s2ram-x86.c	2010-01-01 19:17:27.000000000 +0100
@@ -304,13 +304,13 @@
 {
 	int ret = 0, id;
 
-	if (flags && !force) {
+	if (!force) {
+		if (flags) {
 		printf("The acpi_sleep, vbe_save, vbe_post, radeontool and "
 			"pci_save parameters must be used with --force\n\n");
 		return EINVAL;
 	}
 
-	if (!force) {
 		id = machine_match();
 		ret = s2ram_check(id);
 	}