diff --git a/modules/printbackends/cups/gtkcupsutils.c b/modules/printbackends/cups/gtkcupsutils.c
index 1023da0..dd38ec3 100644
--- a/modules/printbackends/cups/gtkcupsutils.c
+++ b/modules/printbackends/cups/gtkcupsutils.c
@@ -253,8 +253,11 @@ gtk_cups_request_free (GtkCupsRequest *request)
 }
 
 gboolean 
-gtk_cups_request_read_write (GtkCupsRequest *request)
+gtk_cups_request_read_write (GtkCupsRequest *request, gboolean connect_only)
 {
+  if (connect_only && request->state != GTK_CUPS_REQUEST_START)
+    return FALSE;
+
   if (request->type == GTK_CUPS_POST)
     post_states[request->state] (request);
   else if (request->type == GTK_CUPS_GET)
@@ -643,6 +646,7 @@ static void
 _connect (GtkCupsRequest *request)
 {
   request->poll_state = GTK_CUPS_HTTP_IDLE;
+  request->bytes_recieved = 0;
 
   if (request->http == NULL)
     {
@@ -1129,29 +1133,37 @@ _post_read_response (GtkCupsRequest *request)
   if (request->result->ipp_response == NULL)
     request->result->ipp_response = ippNew();
 
-  ipp_status = ippRead (request->http, 
-                        request->result->ipp_response);
-
-  if (ipp_status == IPP_ERROR)
+  /* We need to check httpWait here because there is an internal recieve buffer. 
+   * So we need to keep going until there is no data sitting in the buffer anymore */
+  while (httpWait(request->http, 0))
     {
-      int ipp_error = cupsLastError ();
-      gtk_cups_result_set_error (request->result,  
-                                 GTK_CUPS_ERROR_IPP,
-                                 ipp_status,
-                                 ipp_error,
-                                 "%s",
-                                 ippErrorString (ipp_error));
-      
-      ippDelete (request->result->ipp_response);
-      request->result->ipp_response = NULL;
+      ipp_status = ippRead (request->http, 
+                            request->result->ipp_response);
+      g_print ("_post_read_response: status: %i\n", ipp_status);
 
-      request->state = GTK_CUPS_POST_DONE;
-      request->poll_state = GTK_CUPS_HTTP_IDLE;
-    }
-  else if (ipp_status == IPP_DATA)
-    {
-      request->state = GTK_CUPS_POST_DONE;
-      request->poll_state = GTK_CUPS_HTTP_IDLE;
+      if (ipp_status == IPP_ERROR)
+        {
+          int ipp_error = cupsLastError ();
+          gtk_cups_result_set_error (request->result,  
+                                     GTK_CUPS_ERROR_IPP,
+                                     ipp_status,
+                                     ipp_error,
+                                     "%s",
+                                     ippErrorString (ipp_error));
+          
+          ippDelete (request->result->ipp_response);
+          request->result->ipp_response = NULL;
+
+          request->state = GTK_CUPS_POST_DONE;
+          request->poll_state = GTK_CUPS_HTTP_IDLE;
+          break;
+        }
+      else if (ipp_status == IPP_DATA)
+        {
+          request->state = GTK_CUPS_POST_DONE;
+          request->poll_state = GTK_CUPS_HTTP_IDLE;
+          break;
+        }
     }
 }
 
@@ -1404,6 +1416,7 @@ _get_read_data (GtkCupsRequest *request)
 #else
   bytes = httpRead (request->http, buffer, sizeof (buffer));
 #endif /* HAVE_CUPS_API_1_2 */
+  request->bytes_recieved += bytes;
 
   GTK_NOTE (PRINTING,
             g_print ("CUPS Backend: %i bytes read\n", bytes));
@@ -1423,6 +1436,19 @@ _get_read_data (GtkCupsRequest *request)
 			      &bytes_written,
 			      &error);
 
+  /* Also stop if we do not expect any more data. */
+#if HAVE_CUPS_API_1_2
+  if (httpGetLength2 (request->http) <= request->bytes_recieved)
+#else
+  if (httpGetLength (request->http) <= request->bytes_recieved)
+#endif /* HAVE_CUPS_API_1_2 */
+    {
+      request->state = GTK_CUPS_GET_DONE;
+      request->poll_state = GTK_CUPS_HTTP_IDLE;
+
+      return;
+    }
+
   if (io_status == G_IO_STATUS_ERROR)
     {
       request->state = GTK_CUPS_GET_DONE;
diff --git a/modules/printbackends/cups/gtkcupsutils.h b/modules/printbackends/cups/gtkcupsutils.h
index 2438b86..340f9d2 100644
--- a/modules/printbackends/cups/gtkcupsutils.h
+++ b/modules/printbackends/cups/gtkcupsutils.h
@@ -93,6 +93,7 @@ struct _GtkCupsRequest
 
   gint state;
   GtkCupsPollState poll_state;
+  guint64 bytes_recieved;
 
   gchar *password;
   gchar *username;
@@ -172,7 +173,8 @@ void                    gtk_cups_request_ipp_add_strings   (GtkCupsRequest     *
 const char            * gtk_cups_request_ipp_get_string    (GtkCupsRequest     *request,
 							    ipp_tag_t           tag,
 							    const char         *name);
-gboolean                gtk_cups_request_read_write        (GtkCupsRequest     *request);
+gboolean                gtk_cups_request_read_write        (GtkCupsRequest     *request,
+                                                            gboolean            connect_only);
 GtkCupsPollState        gtk_cups_request_get_poll_state    (GtkCupsRequest     *request);
 void                    gtk_cups_request_free              (GtkCupsRequest     *request);
 GtkCupsResult         * gtk_cups_request_get_result        (GtkCupsRequest     *request);
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 1161618..cca0d8f 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -92,6 +92,7 @@ typedef struct
 
   http_t *http;
   GtkCupsRequest *request;
+  GtkCupsPollState poll_state;
   GPollFD *data_poll;
   GtkPrintBackendCups *backend;
   GtkPrintCupsResponseCallbackFunc callback;
@@ -912,11 +913,20 @@ cups_dispatch_add_poll (GSource *source)
 
   poll_state = gtk_cups_request_get_poll_state (dispatch->request);
 
+  if (poll_state != dispatch->poll_state && dispatch->data_poll != NULL)
+    {
+      g_print ("CUPS Backend: %s Removing poll FD %i <source %p>\n", G_STRFUNC, dispatch->data_poll->fd, source);
+      g_source_remove_poll (source, dispatch->data_poll);
+      g_free (dispatch->data_poll);
+      dispatch->data_poll = NULL;
+    }
+
   if (dispatch->request->http != NULL)
     {
       if (dispatch->data_poll == NULL)
         {
 	  dispatch->data_poll = g_new0 (GPollFD, 1);
+	  dispatch->poll_state = poll_state;
 
 	  if (poll_state == GTK_CUPS_HTTP_READ)
 	    dispatch->data_poll->events = G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI;
@@ -1088,13 +1098,11 @@ cups_dispatch_watch_check (GSource *source)
 
   poll_state = gtk_cups_request_get_poll_state (dispatch->request);
 
-  cups_dispatch_add_poll (source);
-    
   if (poll_state != GTK_CUPS_HTTP_IDLE && !dispatch->request->need_password)
     if (!(dispatch->data_poll->revents & dispatch->data_poll->events)) 
        return FALSE;
   
-  result = gtk_cups_request_read_write (dispatch->request);
+  result = gtk_cups_request_read_write (dispatch->request, FALSE);
   if (result && dispatch->data_poll != NULL)
     {
       g_source_remove_poll (source, dispatch->data_poll);
@@ -1126,7 +1134,7 @@ cups_dispatch_watch_prepare (GSource *source,
 
   *timeout_ = -1;
   
-  result = gtk_cups_request_read_write (dispatch->request);
+  result = gtk_cups_request_read_write (dispatch->request, TRUE);
 
   cups_dispatch_add_poll (source);
 
@@ -1255,6 +1263,7 @@ cups_request_execute (GtkPrintBackendCups              *print_backend,
 
   dispatch->request = request;
   dispatch->backend = g_object_ref (print_backend);
+  dispatch->poll_state = GTK_CUPS_HTTP_IDLE;
   dispatch->data_poll = NULL;
   dispatch->callback = NULL;
   dispatch->callback_data = NULL;
@@ -4083,7 +4092,7 @@ set_option_from_settings (GtkPrinterOption *option,
     {
       cups_value = gtk_print_settings_get (settings, option->name);
       if (cups_value)
-	gtk_printer_option_set (option, cups_value);
+       gtk_printer_option_set (option, cups_value);
     } 
 }
 
