diff --git a/lib/rd.h b/lib/rd.h
index 052f0c3c..42fa7913 100644
--- a/lib/rd.h
+++ b/lib/rd.h
@@ -354,7 +354,6 @@
  * Ripper Settings
  */
 #define RIPPER_BAR_INTERVAL 500
-#define RIPPER_TEMP_DIR "/tmp"
 #define RIPPER_TEMP_WAV "rdlibrary_rip.wav"
 #define RIPPER_TEMP_PEAK "rdlibrary_rip.dat"
 #define RIPPER_CDDB_USER "rdlibrary"
diff --git a/lib/rdtextfile.cpp b/lib/rdtextfile.cpp
index 3315f7e7..9eab3955 100644
--- a/lib/rdtextfile.cpp
+++ b/lib/rdtextfile.cpp
@@ -65,7 +65,7 @@ bool RDTextFile(const QString &data)
   proc->launch("");
   delete proc;
 #else
-  strcpy(tmpfile,"/tmp/rdreportXXXXXX");
+  strcpy(tmpfile,RDTempDir()+"/rdreportXXXXXX");
   int fd=mkstemp(tmpfile);
   if(fd<0) {
     QMessageBox::warning(NULL,"File Error","Unable to create temporary file");
diff --git a/rdlibrary/cdripper.cpp b/rdlibrary/cdripper.cpp
index ca8ff372..df26f678 100644
--- a/rdlibrary/cdripper.cpp
+++ b/rdlibrary/cdripper.cpp
@@ -84,7 +84,7 @@ CdRipper::CdRipper(QString cutname,RDCddbRecord *rec,RDLibraryConf *conf,
   // Create Temporary Directory
   //
   char path[PATH_MAX];
-  strncpy(path,RIPPER_TEMP_DIR,PATH_MAX);
+  strncpy(path,RDTempDir(),PATH_MAX);
   strcat(path,"/XXXXXX");
   if(mkdtemp(path)==NULL) {
     QMessageBox::warning(this,"RDLibrary - "+tr("Ripper Error"),
diff --git a/rdlibrary/disk_ripper.cpp b/rdlibrary/disk_ripper.cpp
index e49eed21..6d1b1dba 100644
--- a/rdlibrary/disk_ripper.cpp
+++ b/rdlibrary/disk_ripper.cpp
@@ -86,7 +86,7 @@ DiskRipper::DiskRipper(QString *filter,QString *group,QString *schedcode,
   // Create Temporary Directory
   //
   char path[PATH_MAX];
-  strncpy(path,RIPPER_TEMP_DIR,PATH_MAX);
+  strncpy(path,RDTempDir(),PATH_MAX);
   strcat(path,"/XXXXXX");
   if(mkdtemp(path)==NULL) {
     QMessageBox::warning(this,"RDLibrary - "+tr("Ripper Error"),