diff --git a/konsole/TEHistory.cpp b/konsole/TEHistory.cpp
index 13244df4..8520d8f4 100644
--- a/konsole/TEHistory.cpp
+++ b/konsole/TEHistory.cpp
@@ -81,9 +81,9 @@ HistoryFile::HistoryFile()
     length(0),
 	fileMap(0)
 {
-  if (tmpFile.status() == 0)
+  if (tmpFile.open())
   { 
-    tmpFile.unlink();
+    tmpFile.setAutoRemove(true);
     ion = tmpFile.handle();
   }
 }
diff --git a/konsole/TEHistory.h b/konsole/TEHistory.h
index 8191b34d..df6619eb 100644
--- a/konsole/TEHistory.h
+++ b/konsole/TEHistory.h
@@ -26,7 +26,7 @@
 //Added by qt3to4:
 #include <QVector>
 
-#include <ktempfile.h>
+#include <ktemporaryfile.h>
 
 #include "TECommon.h"
 
@@ -56,7 +56,7 @@ public:
 private:
   int  ion;
   int  length;
-  KTempFile tmpFile;
+  KTemporaryFile tmpFile;
 
   //pointer to start of mmap'ed file data, or 0 if the file is not mmap'ed
   char* fileMap;
diff --git a/konsole/konsole.cpp b/konsole/konsole.cpp
index c3382fc1..c6046b65 100644
--- a/konsole/konsole.cpp
+++ b/konsole/konsole.cpp
@@ -143,7 +143,7 @@ Time to start a requirement list.
 #include <kstdaction.h>
 #include <kstringhandler.h>
 #include <ktabwidget.h>
-#include <ktempfile.h>
+#include <ktemporaryfile.h>
 #include <ktip.h>
 #include <ktoggleaction.h>
 #include <ktogglefullscreenaction.h>
@@ -3432,9 +3432,9 @@ void Konsole::createSessionMenus()
 
 void Konsole::addScreenSession(const QString &path, const QString &socket)
 {
-  KTempFile *tmpFile = new KTempFile();
-  tmpFile->setAutoDelete(true);
-  KSimpleConfig *co = new KSimpleConfig(tmpFile->name());
+  KTemporaryFile *tmpFile = new KTemporaryFile();
+  tmpFile->open();
+  KSimpleConfig *co = new KSimpleConfig(tmpFile->fileName());
   co->setDesktopGroup();
   co->writeEntry("Name", socket);
   QString txt = i18nc("Screen is a program for controlling screens", "Screen at %1", socket);
@@ -4024,12 +4024,13 @@ void Konsole::slotSaveHistory()
       return;
   KUrl localUrl = KIO::NetAccess::mostLocalUrl( originalUrl, 0 );
 
-  KTempFile* tempFile = 0;
+  KTemporaryFile* tempFile = 0;
 
   if( !localUrl.isLocalFile() ) {
-    tempFile = new KTempFile(QString("konsole_history"));
-    tempFile->setAutoDelete(true);
-    localUrl = KUrl::fromPath(tempFile->name());
+    tempFile = new KTemporaryFile();
+    tempFile->setPrefix("konsole_history");
+    tempFile->open();
+    localUrl = KUrl::fromPath(tempFile->fileName());
   }
 
   int query = KMessageBox::Continue;
diff --git a/konsole/konsole.h b/konsole/konsole.h
index f721af92..96979ddb 100644
--- a/konsole/konsole.h
+++ b/konsole/konsole.h
@@ -69,7 +69,7 @@ class KMenu;
 class KSelectAction;
 //class SessionTabWidget;
 class KTabWidget;
-class KTempFile;
+class KTemporaryFile;
 class KToggleAction;
 
 class SessionInfo;
@@ -318,7 +318,7 @@ private:
   //entry used to create it
   QHash<TESession*,KSimpleConfig*> sessionConfigMap;
 
-  QList<KTempFile*> tempfiles;
+  QList<KTemporaryFile*> tempfiles;
   KSimpleConfig* m_defaultSession;
   QString m_defaultSessionFilename;