diff --git a/client/fileutils.c b/client/fileutils.c
index c3c9f5acc..72771f900 100644
--- a/client/fileutils.c
+++ b/client/fileutils.c
@@ -896,6 +896,8 @@ out:
 }
 
 int searchFile(char **foundpath, const char *pm3dir, const char *searchname, const char *suffix) {
+    if (foundpath == NULL)
+        return PM3_EINVARG;
     char *filename = filenamemcopy(searchname, suffix);
     if (filename == NULL) return PM3_EMALLOC;
     int res = searchFinalFile(foundpath, pm3dir, filename);
diff --git a/client/proxmark3.c b/client/proxmark3.c
index 6a23f4804..913f3735f 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -102,8 +102,13 @@ main_loop(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) {
             PrintAndLogEx(ERR, "could not open " _YELLOW_("%s") "...", script_cmds_file);
     }
 
-    read_history(".history");
-
+    char *my_history_path = NULL;
+    if (searchHomeFilePath(&my_history_path, PROXHISTORY, true) != PM3_SUCCESS) {
+        PrintAndLogEx(ERR, "could not create $HOME/" PROXHISTORY ", no history will be recorded");
+        my_history_path = NULL;
+    } else {
+        read_history(my_history_path);
+    }
     // loops every time enter is pressed...
     while (1) {
         bool printprompt = false;
@@ -220,8 +225,10 @@ main_loop(char *script_cmds_file, char *script_cmd, bool stayInCommandLoop) {
     if (sf)
         fclose(sf);
 
-    write_history(".history");
-
+    if (my_history_path) {
+        write_history(my_history_path);
+        free(my_history_path);
+    }
     if (cmd) {
         free(cmd);
         cmd = NULL;
diff --git a/client/proxmark3.h b/client/proxmark3.h
index 6d245da10..3da261c31 100644
--- a/client/proxmark3.h
+++ b/client/proxmark3.h
@@ -18,6 +18,8 @@
 #define PROXPROMPT_USB "[usb] pm3 --> "
 #define PROXPROMPT_FPC "[fpc] pm3 --> "
 #define PROXPROMPT_OFFLINE "[offline] pm3 --> "
+#define PROXHISTORY "history.txt"
+#define PROXLOG "log_%Y%m%d.txt"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/client/ui.c b/client/ui.c
index 9927fd6d6..86f32e2bd 100644
--- a/client/ui.c
+++ b/client/ui.c
@@ -24,6 +24,9 @@
 #include <readline/readline.h>
 #include <complex.h>
 #include "util.h"
+#include "proxmark3.h"  // PROXLOG
+#include "fileutils.h"
+#include "pm3_cmd.h"
 
 session_arg_t session;
 
@@ -36,9 +39,45 @@ bool GridLocked = false;
 bool showDemod = true;
 
 pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
-static const char *logfilename = "proxmark3.log";
+
 static void fPrintAndLog(FILE *stream, const char *fmt, ...);
 
+// needed by flasher, so let's put it here instead of fileutils.c
+int searchHomeFilePath(char **foundpath, const char *filename, bool create_home) {
+    if (foundpath == NULL)
+        return PM3_EINVARG;
+    char *user_path = getenv("HOME");
+    if (user_path == NULL)
+        return PM3_EFILE;
+    char *path = calloc(strlen(user_path) + strlen(PM3_USER_DIRECTORY) + 1, sizeof(char));
+    if (path == NULL)
+        return PM3_EMALLOC;
+    strcpy(path, user_path);
+    strcat(path, PM3_USER_DIRECTORY);
+
+#ifdef _WIN32
+    struct _stat st;
+    int result = _stat(path, &st);
+#else
+    struct stat st;
+    int result = stat(path, &st);
+#endif
+    if ((result != 0) && create_home) {
+        if (mkdir(path, 0700)) {
+            free(path);
+            return PM3_EFILE;
+        }
+    }
+    if (filename == NULL) {
+        *foundpath = path;
+        return PM3_SUCCESS;
+    }
+    path = realloc(path, (strlen(user_path) + strlen(PM3_USER_DIRECTORY) + strlen(filename) + 1) * sizeof(char));
+    strcat(path, filename);
+    *foundpath = path;
+    return PM3_SUCCESS;
+}
+
 void PrintAndLogOptions(const char *str[][2], size_t size, size_t space) {
     char buff[2000] = "Options:\n";
     char format[2000] = "";
@@ -166,10 +205,24 @@ static void fPrintAndLog(FILE *stream, const char *fmt, ...) {
     pthread_mutex_lock(&print_lock);
 
     if (logging && !logfile) {
-        logfile = fopen(logfilename, "a");
-        if (!logfile) {
-            fprintf(stderr, "Can't open logfile, logging disabled!\n");
+        char *my_logfile_path = NULL;
+        char filename[40];
+        struct tm *timenow;
+        time_t now = time(NULL);
+        timenow = gmtime(&now);
+        strftime(filename, sizeof(filename), PROXLOG, timenow);
+        if (searchHomeFilePath(&my_logfile_path, filename, true) != PM3_SUCCESS) {
+            fprintf(stderr, "Could not create $HOME/.proxmark3/%s, no log will be recorded\n", filename);
+            my_logfile_path = NULL;
             logging = 0;
+        } else {
+            logfile = fopen(my_logfile_path, "a");
+            if (logfile == NULL) {
+                fprintf(stderr, "Can't open logfile %s, logging disabled!\n", my_logfile_path);
+                logging = 0;
+            }
+            printf("Session is logged into %s\n", my_logfile_path);
+            free(my_logfile_path);
         }
     }
 
@@ -228,10 +281,6 @@ static void fPrintAndLog(FILE *stream, const char *fmt, ...) {
     pthread_mutex_unlock(&print_lock);
 }
 
-void SetLogFilename(char *fn) {
-    logfilename = fn;
-}
-
 void SetFlushAfterWrite(bool value) {
     flushAfterWrite = value;
 }
diff --git a/client/ui.h b/client/ui.h
index 648dce4c4..7e00ab52b 100644
--- a/client/ui.h
+++ b/client/ui.h
@@ -39,7 +39,6 @@ void ShowGraphWindow(void);
 void RepaintGraphWindow(void);
 void PrintAndLogOptions(const char *str[][2], size_t size, size_t space);
 void PrintAndLogEx(logLevel_t level, const char *fmt, ...);
-void SetLogFilename(char *fn);
 void SetFlushAfterWrite(bool value);
 void memcpy_filter_ansi(void *dest, const void *src, size_t n, bool filter);
 
@@ -49,6 +48,8 @@ extern uint32_t CursorCPos, CursorDPos;
 extern bool GridLocked;
 extern bool showDemod;
 
+int searchHomeFilePath(char **foundpath, const char *filename, bool create_home);
+
 extern pthread_mutex_t print_lock;
 
 void iceIIR_Butterworth(int *data, const size_t len);