diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
index 7d13656..d297e02 100644
--- a/qt4/src/poppler-document.cc
+++ b/qt4/src/poppler-document.cc
@@ -532,6 +532,8 @@ namespace Poppler {
         int hintForOperation = hint;
         if (touchesOverprinting && !isOverprintPreviewAvailable())
             hintForOperation = hintForOperation & ~(int)Document::OverprintPreview;
+        if (touchesOverprinting)
+          globalParams->setOverprintPreview(on && isOverprintPreviewAvailable());
 
         if ( on )
             m_doc->m_hints |= hintForOperation;
diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
index f9ac443..4c5109c 100644
--- a/qt4/src/poppler-page.cc
+++ b/qt4/src/poppler-page.cc
@@ -229,7 +229,8 @@ TextPage *PageData::prepareTextSearch(const QString &text, Page::SearchMode case
 
   // fetch ourselves a textpage
   TextOutputDev td(NULL, gTrue, 0, gFalse, gFalse);
-  parentDoc->doc->displayPage( &td, index + 1, 72, 72, rotation, false, true, false );
+  parentDoc->doc->displayPage( &td, index + 1, 72, 72, rotation, false, true, false,
+    NULL, NULL, NULL, NULL, true);
   TextPage *textPage=td.takeText();
   
   return textPage;
@@ -261,7 +262,6 @@ QImage Page::renderToImage(double xres, double yres, int x, int y, int w, int h,
       SplashColor bgColor;
 #if defined(SPLASH_CMYK)
       GBool overprint = m_page->parentDoc->m_hints & Document::OverprintPreview ? gTrue : gFalse;
-      globalParams->setOverprintPreview(overprint);
       if (overprint)
       {
         Guchar c, m, y, k;
diff --git a/qt4/src/poppler-ps-converter.cc b/qt4/src/poppler-ps-converter.cc
index 63fb7b4..5793119 100644
--- a/qt4/src/poppler-ps-converter.cc
+++ b/qt4/src/poppler-ps-converter.cc
@@ -253,7 +253,7 @@ bool PSConverter::convert()
 			                              NULL,
 			                              NULL,
 			                              annotDisplayDecideCbk,
-			                              &showAnnotations);
+			                              &showAnnotations, gTrue);
 			if (d->pageConvertedCallback)
 				(*d->pageConvertedCallback)(page, d->pageConvertedPayload);
 		}
diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
index f4f6fc6..6de2b6d 100644
--- a/qt4/src/poppler-qt4.h
+++ b/qt4/src/poppler-qt4.h
@@ -44,6 +44,8 @@
 #include <QtXml/QDomDocument>
 #include "poppler-export.h"
 
+#define POPPLER_QT4_THREADSAFE 1
+
 class EmbFile;
 class Sound;
 class AnnotMovie;