diff --git a/src/driver/audiodec/ffmpegdec.cpp b/src/driver/audiodec/ffmpegdec.cpp
index 19c48a9eb..ef2583775 100644
--- a/src/driver/audiodec/ffmpegdec.cpp
+++ b/src/driver/audiodec/ffmpegdec.cpp
@@ -33,15 +33,19 @@
 #include <cstring>
 #include <errno.h>
 #include <sstream>
+
+#include <global.h>
 #include <driver/audioplay.h>
 #include <zapit/include/audio.h>
 #include <eitd/edvbstring.h> // UTF8
 #include "ffmpegdec.h"
+
 extern "C" {
 #include <libavutil/opt.h>
 #include <libavutil/samplefmt.h>
 #include <libswresample/swresample.h>
 }
+
 #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(55, 28, 1)
 #define av_frame_alloc	avcodec_alloc_frame
 #define av_frame_unref	avcodec_get_frame_defaults
@@ -63,8 +67,6 @@ extern cAudio * audioDecoder;
 
 #define ProgName "FfmpegDec"
 
-#define COVERDIR "/tmp/cover"
-
 static OpenThreads::Mutex mutex;
 
 static int cover_count = 0;
@@ -521,7 +523,7 @@ bool CFfmpegDec::SetMetaData(FILE *_in, CAudioMetaData* m, bool save_cover)
 			if (save_cover && (avc->streams[i]->disposition & AV_DISPOSITION_ATTACHED_PIC)) {
 				mkdir(COVERDIR, 0755);
 				std::string cover(COVERDIR);
-				cover += "/" + to_string(cover_count++) + ".jpg";
+				cover += "/cover_" + to_string(cover_count++) + ".jpg";
 				FILE *f = fopen(cover.c_str(), "wb");
 				if (f) {
 					AVPacket *pkt = &avc->streams[i]->attached_pic;
diff --git a/src/driver/audiodec/mp3dec.cpp b/src/driver/audiodec/mp3dec.cpp
index 69c11d5b4..c555add3f 100644
--- a/src/driver/audiodec/mp3dec.cpp
+++ b/src/driver/audiodec/mp3dec.cpp
@@ -1388,9 +1388,10 @@ bool CMP3Dec::SaveCover(FILE * in, CAudioMetaData * const m)
 							data = id3_field_getbinarydata(field, &size);
 							if ( data )
 							{
+								mkdir(COVERDIR, 0755);
 								std::ostringstream cover;
-								cover.str("");
-								cover << "/tmp/cover_" << cover_count++ << ".jpg";
+								cover.str(COVERDIR);
+								cover << "/cover_" << cover_count++ << ".jpg";
 								FILE * pFile;
 								pFile = fopen ( cover.str().c_str() , "wb" );
 								if (pFile)
diff --git a/src/global.h b/src/global.h
index 7bde595f7..6d3c5497e 100644
--- a/src/global.h
+++ b/src/global.h
@@ -47,6 +47,8 @@
 #define NEUTRINO_SCAN_SETTINGS_FILE     CONFIGDIR "/scan.conf"
 #define NEUTRINO_PARENTALLOCKED_FILE    DATADIR   "/neutrino/.plocked"
 
+#define COVERDIR	"/tmp/cover"
+
 #define LOGODIR		ICONSDIR "/logo"
 #define LOGODIR_VAR	ICONSDIR_VAR "/logo"