diff --git a/lib/utils.pm b/lib/utils.pm
index fd701081..50777c9e 100644
--- a/lib/utils.pm
+++ b/lib/utils.pm
@@ -193,10 +193,11 @@ sub do_bootloader {
         first => 1,
         timeout => 30,
         uefi => get_var("UEFI"),
+        ofw => get_var("OFW"),
         @_
     );
-    # if not postinstall and not UEFI, syslinux
-    $args{bootloader} //= ($args{uefi} || $args{postinstall}) ? "grub" : "syslinux";
+    # if not postinstall not UEFI and not ofw, syslinux
+    $args{bootloader} //= ($args{uefi} || $args{postinstall} || $args{ofw}) ? "grub" : "syslinux";
     if ($args{uefi}) {
         # we use the firmware-type specific tags because we want to be
         # sure we actually did a UEFI boot
@@ -229,7 +230,9 @@ sub do_bootloader {
             }
             send_key "end";
         }
-        type_string " $args{params}";
+        # Change type_string by type_safely because keyboard polling
+        # in SLOF usb-xhci driver failed sometimes in powerpc
+        type_safely " $args{params}";
     }
     # ctrl-X boots from grub editor mode
     send_key "ctrl-x";
diff --git a/needles/anaconda_main_hub_text-20161209.json b/needles/anaconda_main_hub_text-20161209.json
new file mode 100644
index 00000000..65e21a3c
--- /dev/null
+++ b/needles/anaconda_main_hub_text-20161209.json
@@ -0,0 +1,36 @@
+{
+  "tags": [
+    "anaconda_main_hub_text"
+  ],
+  "area": [
+    {
+      "xpos": 2,
+      "height": 10,
+      "width": 304,
+      "ypos": 562,
+      "type": "match"
+    },
+    {
+      "type": "match",
+      "ypos": 322,
+      "width": 127,
+      "xpos": 55,
+      "height": 13
+    },
+    {
+      "ypos": 417,
+      "width": 119,
+      "type": "match",
+      "xpos": 8,
+      "height": 13
+    },
+    {
+      "xpos": 584,
+      "ypos": 338,
+      "width": 10,
+      "height": 10,
+      "type": "match"
+    }
+  ],
+  "properties": []
+}
\ No newline at end of file
diff --git a/needles/anaconda_main_hub_text-20161209.png b/needles/anaconda_main_hub_text-20161209.png
new file mode 100644
index 00000000..23c48570
Binary files /dev/null and b/needles/anaconda_main_hub_text-20161209.png differ
diff --git a/needles/console/anaconda-rescue_mounted-ppc.json b/needles/console/anaconda-rescue_mounted-ppc.json
new file mode 100644
index 00000000..79561ca1
--- /dev/null
+++ b/needles/console/anaconda-rescue_mounted-ppc.json
@@ -0,0 +1,22 @@
+{
+  "properties": [],
+  "tags": [
+    "rescue_mounted"
+  ],
+  "area": [
+    {
+      "xpos": 0,
+      "ypos": 594,
+      "width": 95,
+      "height": 12,
+      "type": "match"
+    },
+    {
+      "xpos": 56,
+      "ypos": 722,
+      "width": 103,
+      "height": 12,
+      "type": "match"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/console/anaconda-rescue_mounted-ppc.png b/needles/console/anaconda-rescue_mounted-ppc.png
new file mode 100644
index 00000000..dd771119
Binary files /dev/null and b/needles/console/anaconda-rescue_mounted-ppc.png differ
diff --git a/needles/console/bootloader_bios_offline_automatic_start-20161108.json b/needles/console/bootloader_bios_offline_automatic_start-20161108.json
new file mode 100644
index 00000000..38950f0c
--- /dev/null
+++ b/needles/console/bootloader_bios_offline_automatic_start-20161108.json
@@ -0,0 +1,25 @@
+{
+  "tags": [
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server",
+    "bootloader",
+    "bootloader_bios"
+  ],
+  "properties": [],
+  "area": [
+    {
+      "xpos": 49,
+      "type": "match",
+      "ypos": 342,
+      "height": 10,
+      "width": 163
+    },
+    {
+      "ypos": 64,
+      "type": "match",
+      "xpos": 54,
+      "width": 54,
+      "height": 30
+    }
+  ]
+}
\ No newline at end of file
diff --git a/needles/console/bootloader_bios_offline_automatic_start-20161108.png b/needles/console/bootloader_bios_offline_automatic_start-20161108.png
new file mode 100644
index 00000000..66fc0cfe
Binary files /dev/null and b/needles/console/bootloader_bios_offline_automatic_start-20161108.png differ
diff --git a/needles/console/bootloader_bios_offline_ppc.json b/needles/console/bootloader_bios_offline_ppc.json
new file mode 100644
index 00000000..cbf22357
--- /dev/null
+++ b/needles/console/bootloader_bios_offline_ppc.json
@@ -0,0 +1,18 @@
+{
+  "tags": [
+    "ENV-DISTRI-fedora",
+    "ENV-FLAVOR-server",
+    "bootloader",
+    "bootloader_bios"
+  ],
+  "properties": [],
+  "area": [
+    {
+      "xpos": 51,
+      "ypos": 343,
+      "width": 513,
+      "height": 10,
+      "type": "match"
+    }
+  ]
+}
diff --git a/needles/console/bootloader_bios_offline_ppc.png b/needles/console/bootloader_bios_offline_ppc.png
new file mode 100644
index 00000000..60386f2d
Binary files /dev/null and b/needles/console/bootloader_bios_offline_ppc.png differ
diff --git a/tests/rescue_mode_encrypted.pm b/tests/rescue_mode_encrypted.pm
index 66d7bf35..ed76a5c2 100644
--- a/tests/rescue_mode_encrypted.pm
+++ b/tests/rescue_mode_encrypted.pm
@@ -5,16 +5,24 @@ use testapi;
 sub run {
     # handle bootloader screen
     assert_screen "bootloader", 30;
-    # select troubleshooting
-    send_key "down";
-    send_key "ret";
-    # select "rescue system"
-    if (get_var('UEFI')) {
+    if (get_var('OFW')) {
+        # select "rescue system" directly
+        send_key "down";
         send_key "down";
         send_key "ret";
     }
     else {
-        type_string "r\n";
+        # select troubleshooting
+        send_key "down";
+        send_key "ret";
+        # select "rescue system"
+        if (get_var('UEFI')) {
+            send_key "down";
+            send_key "ret";
+        }
+        else {
+            type_string "r\n";
+        }
     }
 
     assert_screen "rescue_select", 120; # it takes time to start anaconda