diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46dfc8d0f..12bdbe8ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ All notable changes to this project will be documented in this file.
 This project uses the changelog in accordance with [keepchangelog](http://keepachangelog.com/). Please use this to write notable changes, which is not the same as git commit log...
 
 ## [unreleased][unreleased]
+ - Fixed Python support of `experimental_client_with_swig` (@doegox)
  - Use proxmark3 as a generic smartcard reader with other software with `smart relay` (@gm3197)
  - Added `tools\mfkeys\staticnested` - program to recover static nested keys (@iceman1001)
  - Added `pm3_gen_dictionary.py` - python script to extract and save all keys from MFC dump files. (@iceman1001)
diff --git a/client/Makefile b/client/Makefile
index 0d4f73928..06b4258bb 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -837,7 +837,6 @@ endif
 ifneq (,$(INSTALLSHARE))
 	    $(Q)$(INSTALLSUDO) $(MKDIR) $(DESTDIR)$(PREFIX)$(PATHSEP)$(INSTALLSHARERELPATH)
 	    $(Q)$(INSTALLSUDO) $(CP) $(INSTALLSHARE) $(DESTDIR)$(PREFIX)$(PATHSEP)$(INSTALLSHARERELPATH)
-	    $(Q)$(INSTALLSUDO) $(CP) src/pm3.py $(DESTDIR)$(PREFIX)$(PATHSEP)$(INSTALLSHARERELPATH)/pyscripts
 endif
 	@true
 
diff --git a/client/experimental_lib/example_py/02run_test.sh b/client/experimental_lib/example_py/02run_test.sh
index 67ab20525..f881b459d 100755
--- a/client/experimental_lib/example_py/02run_test.sh
+++ b/client/experimental_lib/example_py/02run_test.sh
@@ -8,4 +8,4 @@
 #/usr/lib/python3/dist-packages/pm3.py
 
 # need access to pm3.py
-PYTHONPATH=../../src ./test.py
+PYTHONPATH=../../pyscripts ./test.py
diff --git a/client/experimental_lib/example_py/02run_test_grab_interactive.sh b/client/experimental_lib/example_py/02run_test_grab_interactive.sh
index d7dd7dd16..5cfa7a038 100755
--- a/client/experimental_lib/example_py/02run_test_grab_interactive.sh
+++ b/client/experimental_lib/example_py/02run_test_grab_interactive.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-PYTHONPATH=../../src ipython3 -i ./test_grab.py
+PYTHONPATH=../../pyscripts ipython3 -i ./test_grab.py
diff --git a/client/experimental_lib/example_py/02run_test_interactive.sh b/client/experimental_lib/example_py/02run_test_interactive.sh
index 701dbb5cf..f7d70a5d4 100755
--- a/client/experimental_lib/example_py/02run_test_interactive.sh
+++ b/client/experimental_lib/example_py/02run_test_interactive.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-PYTHONPATH=../../src ipython3 -i ./test.py
+PYTHONPATH=../../pyscripts ipython3 -i ./test.py
diff --git a/client/src/pm3.py b/client/pyscripts/pm3.py
similarity index 100%
rename from client/src/pm3.py
rename to client/pyscripts/pm3.py
diff --git a/pm3 b/pm3
index b011c8ed5..80aad83d8 100755
--- a/pm3
+++ b/pm3
@@ -27,13 +27,9 @@ if [ ! "$1" == "--list" ]; then
             echo >&2 "[!!] In devel workdir but no executable found, did you compile it?"
             exit 1
         fi
-        # Devel mode: point to workdir pm3.py module
-        EVALENV+=" PYTHONPATH=$PM3PATH/client/src"
     # try install dir
     elif [ -x "$PM3PATH/proxmark3" ]; then
         CLIENT="$PM3PATH/proxmark3"
-        EVALENV+=" PYTHONPATH=$PM3PATH/../share/proxmark3/pyscripts/"
-        #  or /usr/[local/]lib/python3/dist-packages/pm3.py ?
     else
     # hope it's installed somehow, still not sure where fw images and pm3.py are...
         CLIENT="proxmark3"