--- a/panels/printers/pp-new-printer-dialog.c
+++ b/panels/printers/pp-new-printer-dialog.c
@@ -1477,7 +1477,7 @@ new_printer_add_button_cb (GtkButton *button,
   gchar              *device_name = NULL;
   gint                device_id = -1;
   gint                device_type = -1;
-  gint                i, j, k;
+  gint                i;
   int                 num_dests;
 
   treeview = (GtkWidget*)
@@ -1739,9 +1739,7 @@ new_printer_add_button_cb (GtkButton *button,
           GDBusConnection *bus;
           GError     *error = NULL;
           GVariant   *output;
-          ppd_file_t  *ppd_file = NULL;
           gchar       *value = NULL;
-          const gchar *paper_size;
 
           ppd_file_name = cupsGetPPD (pp->devices[device_id].display_name);
 
@@ -1779,43 +1777,12 @@ new_printer_add_button_cb (GtkButton *button,
                   g_free (commands_lowercase);
                 }
 
-
-              /* Set default PaperSize according to the locale */
-              paper_size = gtk_paper_size_get_default ();
-              if (g_str_equal (paper_size, GTK_PAPER_NAME_LETTER))
-                paper_size = "Letter";
+              /* Set default media size according to the locale */
+              if (g_str_equal (gtk_paper_size_get_default (), GTK_PAPER_NAME_LETTER))
+                value = g_strdup ("na-letter");
               else
-                paper_size = "A4";
-
-              if (ppd_file_name)
-                {
-                  ppd_file = ppdOpenFile (ppd_file_name);
-                  if (ppd_file)
-                    {
-                      ppdMarkDefaults (ppd_file);
-                      for (i = 0; i < ppd_file->num_groups; i++)
-                        for (j = 0; j < ppd_file->groups[i].num_options; j++)
-                          if (g_strcmp0 ("PageSize", ppd_file->groups[i].options[j].keyword) == 0)
-                            {
-                              for (k = 0; k < ppd_file->groups[i].options[j].num_choices; k++)
-                                {
-                                  if (g_ascii_strncasecmp (paper_size,
-                                                           ppd_file->groups[i].options[j].choices[k].choice,
-                                                           strlen (paper_size)) == 0 &&
-                                      !ppd_file->groups[i].options[j].choices[k].marked)
-                                    {
-                                      value = g_strdup (ppd_file->groups[i].options[j].choices[k].choice);
-                                      break;
-                                    }
-                                }
-                              break;
-                            }
-                      ppdClose (ppd_file);
-                    }
-                }
+                value = g_strdup ("iso-a4");
 
-              if (value)
-                {
                   GVariantBuilder array_builder;
 
                   g_variant_builder_init (&array_builder, G_VARIANT_TYPE ("as"));
@@ -1825,16 +1792,17 @@ new_printer_add_button_cb (GtkButton *button,
                                                         MECHANISM_BUS,
                                                         "/",
                                                         MECHANISM_BUS,
-                                                        "PrinterAddOptionDefault",
+                                                    "PrinterAddOption",
                                                         g_variant_new ("(ssas)",
                                                                        pp->devices[device_id].display_name,
-                                                                       "PageSize",
+                                                                   "media",
                                                                        &array_builder),
                                                         G_VARIANT_TYPE ("(s)"),
                                                         G_DBUS_CALL_FLAGS_NONE,
                                                         -1,
                                                         NULL,
                                                         &error);
+
                   g_object_unref (bus);
 
                   if (output)
@@ -1849,13 +1817,15 @@ new_printer_add_button_cb (GtkButton *button,
                     }
                   else
                     {
+                  if (!(error->domain == G_DBUS_ERROR &&
+                        (error->code == G_DBUS_ERROR_SERVICE_UNKNOWN ||
+                         error->code == G_DBUS_ERROR_UNKNOWN_METHOD)))
                       g_warning ("%s", error->message);
                       g_error_free (error);
                     }
 
                   g_free (value);
                 }
-            }
 
           if (pp->devices[device_id].device_uri &&
               dbus_method_available (FIREWALLD_BUS,
