diff --git a/.git_store_meta b/.git_store_meta
index 2684683..ec09188 100644
--- a/.git_store_meta
+++ b/.git_store_meta
@@ -5,13 +5,13 @@ branch.txt	f	2011-05-30T18:19:22Z
 BuildBz2.sh	f	2014-01-19T14:46:02Z
 BuildMp3Diags.hta	f	2019-04-03T21:53:10Z
 Build.sh	f	2019-04-06T08:36:24Z
-changelogDeb.txt	f	2019-04-06T08:10:34Z
-changelogRpm.txt	f	2019-04-06T08:10:14Z
-changelog.txt	f	2019-04-06T08:10:21Z
+changelogDeb.txt	f	2021-09-01T16:31:19Z
+changelogRpm.txt	f	2021-09-01T16:34:25Z
+changelog.txt	f	2021-09-01T16:34:25Z
 CMakeLists.txt	f	2009-09-25T14:27:54Z
 CMake-VS2008-Win32.cmd	f	2009-09-23T16:55:34Z
 COPYING	f	2016-08-06T13:23:08Z
-CopyToSf.sh	f	2013-04-24T05:12:00Z
+CopyToSf.sh	f	2019-04-07T14:22:05Z
 desktop/MP3DiagsBckg.xcf	f	2009-05-19T15:31:08Z
 desktop/MP3Diags.desktop	f	2013-06-16T23:01:07Z
 desktop/MP3Diags-unstable16.png	f	2011-07-28T21:00:46Z
@@ -139,7 +139,7 @@ doc/html/180_folder_filter.png	f	2009-10-06T14:56:10Z
 doc/html/190_tag_editor.html	f	2012-01-02T19:00:51Z
 doc/html/190_tag_editor.png	f	2009-10-15T08:23:26Z
 doc/html/1pixel.png	f	2009-05-13T17:26:27Z
-doc/html/200_discogs_query.html	f	2012-01-02T19:07:28Z
+doc/html/200_discogs_query.html	f	2019-04-07T14:51:10Z
 doc/html/200_discogs_query.png	f	2009-10-20T08:35:07Z
 doc/html/210_tag_editor_assign_image.html	f	2012-01-02T18:59:13Z
 doc/html/210_tag_editor_assign_image.png	f	2009-10-15T07:55:54Z
@@ -185,7 +185,7 @@ doc/html/favicon.ico	f	2011-05-28T16:44:27Z
 doc/html/file-rename.png	f	2012-01-02T18:53:05Z
 doc/html/filter-folder.png	f	2012-01-02T19:13:33Z
 doc/html/filter-note.png	f	2012-01-02T19:10:21Z
-doc/html/index.html	f	2015-03-19T20:11:38Z
+doc/html/index.html	f	2019-05-05T19:47:36Z
 doc/html/logo.png	f	2011-05-28T16:14:37Z
 doc/html/musicbrainz.png	f	2012-01-02T19:06:30Z
 doc/html/normalize.png	f	2012-01-02T18:56:40Z
@@ -221,7 +221,7 @@ doc/z_lines.xcf	f	2009-05-12T09:38:40Z
 Doxyfile	f	2011-05-21T07:43:21Z
 .gitignore	f	2019-04-06T10:17:06Z
 Install.sh	f	2014-01-19T14:37:42Z
-MakeArchives.sh	f	2016-06-21T16:37:12Z
+MakeArchives.sh	f	2021-09-01T16:36:47Z
 MakeTranslations.sh	f	2019-04-06T08:34:05Z
 MP3DiagsCLI.cmd	f	2011-07-31T07:26:38Z
 mp3diags.pro	f	2019-04-03T21:39:13Z
@@ -236,11 +236,11 @@ package/rpm/MP3Diags.spec	f	2012-03-11T16:00:37Z
 package/sourceforge/linux_downloads.html	f	2009-06-10T07:26:41Z
 README.TXT	f	2012-12-02T03:27:46Z
 Rebuild-Transl-_ts-Files.sh	f	2014-01-17T10:00:28Z
-Release.txt	f	2019-04-06T07:53:28Z
+Release.txt	f	2021-09-01T16:23:50Z
 src/AboutDlgImpl.cpp	f	2019-02-10T21:56:35Z
 src/AboutDlgImpl.h	f	2009-07-17T15:02:37Z
 src/About.ui	f	2011-06-15T19:56:47Z
-src/AlbumInfoDownloaderDlgImpl.cpp	f	2019-04-03T21:42:05Z
+src/AlbumInfoDownloaderDlgImpl.cpp	f	2021-09-01T09:36:03Z
 src/AlbumInfoDownloaderDlgImpl.h	f	2012-02-16T20:56:36Z
 src/AlbumInfoDownloader.ui	f	2012-01-02T15:14:52Z
 src/ApeStream.cpp	f	2014-11-12T17:36:59Z
@@ -288,7 +288,7 @@ src/fstream_unicode.cpp	f	2014-11-12T16:10:31Z
 src/fstream_unicode.h	f	2014-01-16T13:37:36Z
 src/FullSizeImgDlg.cpp	f	2012-03-03T20:13:54Z
 src/FullSizeImgDlg.h	f	2009-11-28T07:25:00Z
-src/Helpers.cpp	f	2019-04-03T21:44:01Z
+src/Helpers.cpp	f	2021-09-01T15:22:04Z
 src/Helpers.h	f	2019-02-16T21:59:06Z
 src/Id3Transf.cpp	f	2012-03-03T20:24:37Z
 src/Id3Transf.h	f	2012-03-03T14:27:44Z
@@ -374,7 +374,7 @@ src/MainForm.ui	f	2011-07-30T12:34:43Z
 src/Mp3Diags.qrc	f	2012-02-05T19:46:04Z
 src/Mp3Manip.cpp	f	2016-09-19T17:28:06Z
 src/Mp3Manip.h	f	2016-07-04T21:18:43Z
-src/Mp3TransformThread.cpp	f	2016-07-04T21:20:45Z
+src/Mp3TransformThread.cpp	f	2021-09-01T09:36:18Z
 src/Mp3TransformThread.h	f	2014-09-24T08:48:58Z
 src/MpegFrame.cpp	f	2014-11-12T17:36:59Z
 src/MpegFrame.h	f	2014-11-13T17:40:01Z
@@ -417,7 +417,7 @@ src/Sessions.ui	f	2012-02-12T11:48:31Z
 src/SimpleSaxHandler.h	f	2014-11-12T15:53:13Z
 src/SongInfoParser.cpp	f	2014-11-12T16:53:17Z
 src/SongInfoParser.h	f	2014-11-13T17:42:16Z
-src/src.pro	f	2019-02-11T22:31:28Z
+src/src.pro	f	2021-09-01T09:36:34Z
 src/src.pro.w10	f	2019-04-03T22:17:29Z
 src/StoredSettings.cpp	f	2012-01-25T22:17:31Z
 src/StoredSettings.h	f	2016-06-21T12:16:07Z
@@ -432,7 +432,7 @@ src/TagEdtPatternsDlgImpl.cpp	f	2012-03-04T14:05:10Z
 src/TagEdtPatternsDlgImpl.h	f	2009-07-28T07:25:59Z
 src/TagReadPanel.cpp	f	2019-02-16T22:16:07Z
 src/TagReadPanel.h	f	2009-09-30T11:53:40Z
-src/TagWriter.cpp	f	2016-07-14T08:24:07Z
+src/TagWriter.cpp	f	2021-09-01T08:56:13Z
 src/TagWriter.h	f	2014-11-12T11:53:36Z
 src/ThreadRunnerDlgImpl.cpp	f	2019-02-10T21:50:13Z
 src/ThreadRunnerDlgImpl.h	f	2019-02-10T21:28:43Z
diff --git a/CopyToSf.sh b/CopyToSf.sh
index b7be255..9173fe7 100755
--- a/CopyToSf.sh
+++ b/CopyToSf.sh
@@ -7,11 +7,11 @@ BranchDash=`echo "$BranchSlash" | sed 's#/#-#'`
 rm -rf mp3diags
 
 
-mkdir -p mp3diags"$BranchSlash"/mp3diags-linux-bin/x86_64
-cp -p MP3Diags"$BranchDash"-Linux-x86_64-*.tar.bz2 mp3diags"$BranchSlash"/mp3diags-linux-bin/x86_64/MP3Diags"$BranchDash"-Linux-x86_64.tar.bz2 ; cp -p MP3Diags"$BranchDash"-Linux-x86_64-*.tar.bz2 mp3diags"$BranchSlash"/mp3diags-linux-bin/x86_64/
+#disabled until linux binary available# mkdir -p mp3diags"$BranchSlash"/mp3diags-linux-bin/x86_64
+#disabled until linux binary available# cp -p MP3Diags"$BranchDash"-Linux-x86_64-*.tar.bz2 mp3diags"$BranchSlash"/mp3diags-linux-bin/x86_64/MP3Diags"$BranchDash"-Linux-x86_64.tar.bz2 ; cp -p MP3Diags"$BranchDash"-Linux-x86_64-*.tar.bz2 mp3diags"$BranchSlash"/mp3diags-linux-bin/x86_64/
 
-mkdir -p mp3diags"$BranchSlash"/mp3diags-linux-bin/i686
-cp -p MP3Diags"$BranchDash"-Linux-i686-*.tar.bz2 mp3diags"$BranchSlash"/mp3diags-linux-bin/i686/MP3Diags"$BranchDash"-Linux-i686.tar.bz2 ; cp -p MP3Diags"$BranchDash"-Linux-i686-*.tar.bz2 mp3diags"$BranchSlash"/mp3diags-linux-bin/i686/
+#disabled until linux binary available# mkdir -p mp3diags"$BranchSlash"/mp3diags-linux-bin/i686
+#disabled until linux binary available# cp -p MP3Diags"$BranchDash"-Linux-i686-*.tar.bz2 mp3diags"$BranchSlash"/mp3diags-linux-bin/i686/MP3Diags"$BranchDash"-Linux-i686.tar.bz2 ; cp -p MP3Diags"$BranchDash"-Linux-i686-*.tar.bz2 mp3diags"$BranchSlash"/mp3diags-linux-bin/i686/
 
 mkdir -p mp3diags"$BranchSlash"/mp3diags-doc
 cp -p MP3DiagsDoc"$BranchDash"-*.tar.gz mp3diags"$BranchSlash"/mp3diags-doc/MP3DiagsDoc"$BranchDash".tar.gz ; cp -p MP3DiagsDoc"$BranchDash"-*.tar.gz mp3diags"$BranchSlash"/mp3diags-doc/
@@ -30,7 +30,7 @@ cp -p MP3DiagsSetup"$BranchDash"-*.exe mp3diags"$BranchSlash"/mp3diags-windows-s
 # at the top level of the "unstable" or of "linux-bin" there's no indication that newer versions are available
 
 # !!! touch creates empty files, which aren't shown at SF, so we need some content
-date > mp3diags"$BranchSlash"/mp3diags-linux-bin/t
+#disabled until linux binary available# date > mp3diags"$BranchSlash"/mp3diags-linux-bin/t
 date > mp3diags"$BranchSlash"/t
 
 
@@ -41,9 +41,9 @@ rsync -avP -e ssh mp3diags/ ciobi07,mp3diags@frs.sourceforge.net:/home/frs/proje
 echo 'sleeping 20 seconds ...'
 sleep 20
 
-rm mp3diags"$BranchSlash"/mp3diags-linux-bin/t
+#disabled until linux binary available# rm mp3diags"$BranchSlash"/mp3diags-linux-bin/t
 rm mp3diags"$BranchSlash"/t
-rsync -avP --delete -e ssh mp3diags"$BranchSlash"/mp3diags-linux-bin/ --include=t --exclude='*' ciobi07,mp3diags@frs.sourceforge.net:/home/frs/project/m/mp/mp3diags"$BranchSlash"/mp3diags-linux-bin
+#disabled until linux binary available# rsync -avP --delete -e ssh mp3diags"$BranchSlash"/mp3diags-linux-bin/ --include=t --exclude='*' ciobi07,mp3diags@frs.sourceforge.net:/home/frs/project/m/mp/mp3diags"$BranchSlash"/mp3diags-linux-bin
 rsync -avP --delete -e ssh mp3diags"$BranchSlash"/ --include=t --exclude='*' ciobi07,mp3diags@frs.sourceforge.net:/home/frs/project/m/mp/mp3diags"$BranchSlash"
 
 
diff --git a/MakeArchives.sh b/MakeArchives.sh
index d061fe0..920cf68 100755
--- a/MakeArchives.sh
+++ b/MakeArchives.sh
@@ -96,7 +96,7 @@ function createSrc
     cp -p CMakeLists.txt $LongDestDir
     cp -p CMake-VS2008-Win32.cmd $LongDestDir
     cat BuildMp3Diags.hta | sed -e "s#MP3DiagsWindows#MP3DiagsWindows$BranchDash#g" > $LongDestDir/BuildMp3Diags.hta
-    cp -p README.TXT $LongDestDir
+    cp -p README.md $LongDestDir
     cp package/out/pad_file.xml $LongDestDir
     cat MP3DiagsCLI.cmd | sed -e "s#MP3DiagsWindows#MP3DiagsWindows$BranchDash#g" > $LongDestDir/MP3DiagsCLI$BranchDash.cmd
 
diff --git a/README.TXT b/README.TXT
deleted file mode 100644
index 0712a3c..0000000
--- a/README.TXT
+++ /dev/null
@@ -1,16 +0,0 @@
-In most cases it's easier to use pre-built binaries, which are available for
-Windows and for several major Linux distributions from the main download page:
-    http://mp3diags.sourceforge.net/unstable/010_getting_the_program.html
-
-
-Build instructions for Windows are at:
-    http://mp3diags.sourceforge.net/unstable/010_getting_the_program.html#sourceWindows
-
-Build instructions for Linux / others are at:
-    http://mp3diags.sourceforge.net/unstable/010_getting_the_program.html#sourceGeneric
-
-
-Basically, you should run BuildMp3Diags.hta on Windows and Install.sh elsewhere.
-
-Note that even if there is a CMakeLists.txt, CMake isn't officially supported.
-If it works for you - fine. If it doesn't - you're on your own.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..74d0132
--- /dev/null
+++ b/README.md
@@ -0,0 +1,24 @@
+MP3 Diags
+---------
+
+MP3 Diags finds problems in MP3 files and helps the user fix many of them. It looks at both the audio part (VBR info, quality, normalization) and the tags containing track information (ID3). It has a tag editor, which can download album information (including cover art) from MusicBrainz and Discogs, as well as paste data from the clipboard. Track information can also be extracted from a file's name. Another component is the file renamer, which can rename files based on the fields in their ID3V2 tag (artist, track number, album, genre, etc.).
+
+For more detailed information visit http://mp3diags.sf.net/ and https://mp3diags.blogspot.com/
+
+Installation
+------------
+
+In most cases it's easier to use pre-built binaries, which are available for
+Windows and for several major Linux distributions from the main download page:
+    http://mp3diags.sourceforge.net/unstable/010_getting_the_program.html
+
+Build instructions for Windows are at:
+    http://mp3diags.sourceforge.net/unstable/010_getting_the_program.html#sourceWindows
+
+Build instructions for Linux / others are at:
+    http://mp3diags.sourceforge.net/unstable/010_getting_the_program.html#sourceGeneric
+
+Basically, you should run BuildMp3Diags.hta on Windows and Install.sh elsewhere.
+
+Note that even if there is a CMakeLists.txt, CMake isn't officially supported.
+If it works for you – fine. If it doesn't – you're on your own.
diff --git a/Release.txt b/Release.txt
index 267b934..8f5650d 100644
--- a/Release.txt
+++ b/Release.txt
@@ -1 +1 @@
-1.5.01
+1.5.02
diff --git a/changelog.txt b/changelog.txt
index b56af49..eba7963 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,7 @@
+01.09.2021 - 1.5.02
+- Made "close" button visible in KDE
+- Added some compile-time checks to make project build on Arch
+
 ---------------------------------------------------------------------------
 
 06.04.2019 - 1.5.01
diff --git a/changelogDeb.txt b/changelogDeb.txt
index aa8965b..6abf58f 100644
--- a/changelogDeb.txt
+++ b/changelogDeb.txt
@@ -1,3 +1,10 @@
+mp3diags (1.5.02) testing; urgency=low
+
+  * Made "close" button visible in KDE
+  * Added some compile-time checks to make project build on Arch
+
+ -- Marian Ciobanu <ciobi07@users.sourceforge.net>  Wed, 1 Sep 2021 22:00:00 +0200
+
 mp3diags (1.5.01) testing; urgency=low
 
   * Qt5 port
diff --git a/changelogRpm.txt b/changelogRpm.txt
index 34d6e44..26975a2 100644
--- a/changelogRpm.txt
+++ b/changelogRpm.txt
@@ -1,3 +1,8 @@
+* Wed Sep 01 2021 Marian Ciobanu <ciobi07@users.sourceforge.net> 1.5.02
+
+- Made "close" button visible in KDE
+- Added some compile-time checks to make project build on Arch
+
 * Sat Apr 06 2019 Marian Ciobanu <ciobi07@users.sourceforge.net> 1.5.01
 
 - Qt5 port
diff --git a/debian/changelog b/debian/changelog
index 2fcdb25..1739396 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mp3diags (1.5.01+git20210901.1.e511536-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+  * Drop patch 01-fix-format-not-a-string-literal.patch, present upstream.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sun, 20 Mar 2022 12:00:53 -0000
+
 mp3diags (1.5.01-2) unstable; urgency=medium
 
   * Bump debhelper-compat to use (= 13)
diff --git a/debian/patches/01-disable_updates.patch b/debian/patches/01-disable_updates.patch
index 4376c20..bfe3072 100644
--- a/debian/patches/01-disable_updates.patch
+++ b/debian/patches/01-disable_updates.patch
@@ -2,9 +2,11 @@ Author: Alessio Treglia <quadrispro@ubuntu.com>
 Description: Disable updates check.
 
 
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -168,7 +168,7 @@
+Index: mp3diags/src/src.pro
+===================================================================
+--- mp3diags.orig/src/src.pro
++++ mp3diags/src/src.pro
+@@ -171,7 +171,7 @@ QMAKE_CXXFLAGS += -Werror=format
  
  QMAKE_CXXFLAGS_DEBUG += -DOUTPUT_TRACE_TO_CONSOLE -Wno-unused-parameter -Wno-deprecated-declarations -Wno-zero-as-null-pointer-constant -Wno-sign-conversion -Wno-weak-vtables -Wno-sign-conversion
  
diff --git a/debian/patches/01-fix-format-not-a-string-literal.patch b/debian/patches/01-fix-format-not-a-string-literal.patch
deleted file mode 100644
index 6892d88..0000000
--- a/debian/patches/01-fix-format-not-a-string-literal.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix format not a string literal error.
-Author: Josue Ortega <josue@debian.org>
-Last-Update: 2016-08-03
-
---- a/src/Mp3TransformThread.cpp
-+++ b/src/Mp3TransformThread.cpp
-@@ -676,7 +676,7 @@
-     {
-         qDebug("Caught std::exception in Mp3TransformThread::transform()");
-         traceToFile("Caught std::exception in Mp3TransformThread::transform()", 0);
--        qDebug(ex.what());
-+        qDebug("%s", ex.what());
-         traceToFile(ex.what(), 0);
-         throw; // !!! needed to restore "erased" files when errors occur, because when an exception is thrown the destructors only get called if that exception is caught; so catching and rethrowing is not a "no-op"
-     }
diff --git a/debian/patches/03-pass_flags_to_qmake.patch b/debian/patches/03-pass_flags_to_qmake.patch
index 56c1464..ada885a 100644
--- a/debian/patches/03-pass_flags_to_qmake.patch
+++ b/debian/patches/03-pass_flags_to_qmake.patch
@@ -3,9 +3,11 @@ Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560025
 Description: Pass C{,XX}FLAGS to qmake.--- a/src/src.pro
 Last-Update: 2019-08-23
 
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -181,6 +181,11 @@
+Index: mp3diags/src/src.pro
+===================================================================
+--- mp3diags.orig/src/src.pro
++++ mp3diags/src/src.pro
+@@ -184,6 +184,11 @@ LIBS += -lz \
    -lboost_serialization\
    -lboost_program_options
  
diff --git a/debian/patches/series b/debian/patches/series
index df50187..6765049 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 03-pass_flags_to_qmake.patch
-01-fix-format-not-a-string-literal.patch
 01-disable_updates.patch
diff --git a/doc/html/200_discogs_query.html b/doc/html/200_discogs_query.html
index 4cf18c3..0d7ce17 100644
--- a/doc/html/200_discogs_query.html
+++ b/doc/html/200_discogs_query.html
@@ -55,6 +55,12 @@
 </div>
 
 
+<div class="Screenshot RegFnt MildWarnCol">
+    Due to changes in the way Discogs and MusicBrainz operate, the functionality described here was no longer working and has been disabled. Depending on user
+    interest, it can be put back after making it work again.
+</div>
+
+<strike>
 <div class="FreeNormalText RegFnt ChpCol2">
 Click on <img src="discogs-small.png" /> or on <img src="musicbrainz.png" /> in the <a href="190_tag_editor.html">tag editor</a> to open this window.
 </div>
@@ -134,7 +140,7 @@ Reasons for providing links to Amazon.com
 </div>
 </div>
 
-
+</strike>
 
 <!--QQQStatCounterQQQ-->
 
diff --git a/doc/html/index.html b/doc/html/index.html
index 8204eed..6a46655 100644
--- a/doc/html/index.html
+++ b/doc/html/index.html
@@ -222,6 +222,7 @@ Some sites notified me that they reviewed the program (or, well, copied the home
     <li><a href="http://mp3-diags.softonic.it/">softonic.it</a> (Italian)</li>
     <li><a href="http://www.softsea.com/review/MP3-Diags.html">softsea.com</a></li>
     <li><a href="http://www.designcontest.com/show/mp3diags-clicknet-fi">Michael Sirola's Finnish translation of the home page</a></li>
+    <li><a href="https://maddownload.com/audio-video/audio-editors/mp3-diags/">maddownload.com</a></li>
 </ul>
 
 (There seems to be a relatively large Italian following.)
diff --git a/src/AlbumInfoDownloaderDlgImpl.cpp b/src/AlbumInfoDownloaderDlgImpl.cpp
index 880bfad..385d716 100755
--- a/src/AlbumInfoDownloaderDlgImpl.cpp
+++ b/src/AlbumInfoDownloaderDlgImpl.cpp
@@ -106,7 +106,7 @@ LAST_STEP("AlbumInfoDownloaderDlgImpl::getInfo");
             {
                 if (m_pVolumeCbB->currentIndex() == m_pVolumeCbB->count() - 1)
                 { // just give sequential numbers when "<All>" in a multivolume is used - see https://sourceforge.net/projects/mp3diags/forums/forum/947206/topic/4503061/index/page/1 - perhaps can be improved
-                    char a [10];
+                    char a [15];
                     for (int i = 0; i < cSize(pAlbumInfo->m_vTracks); ++i)
                     {
                         sprintf(a, "%02d", i + 1);
diff --git a/src/Helpers.cpp b/src/Helpers.cpp
index 5a1862e..2318943 100755
--- a/src/Helpers.cpp
+++ b/src/Helpers.cpp
@@ -915,7 +915,7 @@ Ideally a modal dialog should minimize its parent. If that's not possible, it sh
 //ttt0 look at Qt::CustomizeWindowHint
 #ifndef WIN32
     //Qt::WindowFlags getMainWndFlags() { return isRunningOnGnome() ? Qt::Window : Qt::WindowTitleHint; } // !!! these are incorrect, but seem the best option; the values used for Windows are supposed to be OK; they work as expected with KDE but not with Gnome (asking for maximize button not only fails to show it, but causes the "Close" button to disappear as well); Since in KDE min/max buttons are shown when needed anyway, it's sort of OK // ttt2 see if there is workaround/fix
-    Qt::WindowFlags getMainWndFlags() { const DesktopDetector& dd = getDesktopDetector(); return dd.onDesktop(DesktopDetector::Kde) ? Qt::WindowTitleHint : Qt::Window; }
+    Qt::WindowFlags getMainWndFlags() { /*const DesktopDetector& dd = getDesktopDetector();*/ return /*dd.onDesktop(DesktopDetector::Kde) ? Qt::WindowTitleHint | Qt::WindowCloseButtonHint :*/ Qt::Window; }
 #if QT_VERSION >= 0x040500
     //Qt::WindowFlags getDialogWndFlags() { const DesktopDetector& dd = getDesktopDetector(); return dd.onDesktop(DesktopDetector::Kde) ? Qt::WindowTitleHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint : (dd.onDesktop(DesktopDetector::Gnome3) ? Qt::Window : Qt::WindowTitleHint); }
     Qt::WindowFlags getDialogWndFlags() { const DesktopDetector& dd = getDesktopDetector(); return dd.onDesktop(DesktopDetector::Kde) ? Qt::WindowTitleHint | Qt::WindowMaximizeButtonHint | Qt::WindowCloseButtonHint : (/*dd.onDesktop(DesktopDetector::Gnome3) ? Qt::Window :*/ Qt::WindowTitleHint); }
diff --git a/src/Mp3TransformThread.cpp b/src/Mp3TransformThread.cpp
index 9ca9c4f..c73aef3 100644
--- a/src/Mp3TransformThread.cpp
+++ b/src/Mp3TransformThread.cpp
@@ -676,7 +676,7 @@ bool Mp3Transformer::transform()
     {
         qDebug("Caught std::exception in Mp3TransformThread::transform()");
         traceToFile("Caught std::exception in Mp3TransformThread::transform()", 0);
-        qDebug(ex.what());
+        qDebug("%s", ex.what());
         traceToFile(ex.what(), 0);
         throw; // !!! needed to restore "erased" files when errors occur, because when an exception is thrown the destructors only get called if that exception is caught; so catching and rethrowing is not a "no-op"
     }
diff --git a/src/TagWriter.cpp b/src/TagWriter.cpp
index dcf9848..2f08f25 100644
--- a/src/TagWriter.cpp
+++ b/src/TagWriter.cpp
@@ -520,7 +520,7 @@ void Mp3HandlerTagData::setUp()
                     int k (m_pTagWriter->getIndex(imageInfo));
                     if (-1 != k)
                     {
-                        char a [10];
+                        char a [15];
                         sprintf(a, g_szImageFmt, k + 1);
                         inf.m_strValue = a;
 
@@ -677,7 +677,7 @@ std::string Mp3HandlerTagData::getData(int nField, int k) const
             {
                 int j (m_pTagWriter->getIndex(imageInfo));
                 // CB_ASSERT (j >= 0); // !!! no need to assert; m_pTagWriter already does it
-                char a [10];
+                char a [15];
                 sprintf(a, g_szImageFmt, j + 1);
 //cout << "   " << a << endl;
                 m_vstrImgCache[k] = a; return m_vstrImgCache[k];
@@ -1603,7 +1603,7 @@ void TagWriter::getAlbumInfo(std::string& strArtist, std::string& strAlbum)
 
 void TagWriter::onAssignImage(int nPos)
 {
-    char a [10];
+    char a [15];
     sprintf(a, g_szImageFmt, nPos + 1);
     set<int> snSelSongs;
     for (set<OrigValue>::iterator it = m_sSelOrigVal.begin(), end = m_sSelOrigVal.end(); it != end; ++it)
diff --git a/src/src.pro b/src/src.pro
index cc13e27..cc78c9a 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -166,6 +166,9 @@ UI_DIR = ui-forms
 
 # !!! One thing to keep in mind is that when using BuildMp3Diags.hta the file src.pro shouldn't be changed. At the first build attempt a copy src.pro1 is created in the "package" dir, and that is where changes for the actual location of the libs
 
+QMAKE_CXXFLAGS += -Werror=format-security
+QMAKE_CXXFLAGS += -Werror=format
+
 QMAKE_CXXFLAGS_DEBUG += -DOUTPUT_TRACE_TO_CONSOLE -Wno-unused-parameter -Wno-deprecated-declarations -Wno-zero-as-null-pointer-constant -Wno-sign-conversion -Wno-weak-vtables -Wno-sign-conversion
 
 #DEFINES += DISABLE_CHECK_FOR_UPDATES