diff --git a/src/libcalamaresui/utils/Paste.cpp b/src/libcalamaresui/utils/Paste.cpp
index 2d2f5404e..ea20dc8b2 100644
--- a/src/libcalamaresui/utils/Paste.cpp
+++ b/src/libcalamaresui/utils/Paste.cpp
@@ -12,11 +12,15 @@
 #include "Branding.h"
 #include "DllMacro.h"
 #include "utils/Logger.h"
+#include "utils/Units.h"
 
 #include <QFile>
+#include <QFileInfo>
 #include <QTcpSocket>
 #include <QUrl>
 
+using namespace CalamaresUtils::Units;
+
 /** @brief Reads the logfile, returns its contents.
  *
  * Returns an empty QByteArray() on any kind of error.
@@ -30,8 +34,12 @@ logFileContents()
         cError() << "Could not open log file";
         return QByteArray();
     }
-    // TODO: read the **last** 16kiB?
-    return pasteSourceFile.read( 16384 /* bytes */ );
+    QFileInfo fi( pasteSourceFile );
+    if ( fi.size() > 16_KiB )
+    {
+        pasteSourceFile.seek( fi.size() - 16_KiB );
+    }
+    return pasteSourceFile.read( 16_KiB );
 }