diff --git a/Makefile b/Makefile
index e8354d3c52..2fcfae76f3 100644
--- a/Makefile
+++ b/Makefile
@@ -108,13 +108,13 @@ ifeq ($(QT5_PCFILEDIR),)
   $(error Can't find your Qt5 installation. Please run "$(MAKE) QTDIR=/path/to/your/Qt5/installation/prefix ...")
  else
   ifeq ($(detected_OS), Darwin)
-   QT5_PCFILEDIR := $(QTDIR)/clang_64/lib/pkgconfig
-   QT5_LIBDIR := $(QTDIR)/clang_64/lib
+   QT5_PCFILEDIR := $(QTDIR)/lib/pkgconfig
+   QT5_LIBDIR := $(QTDIR)/lib
    # some manually installed Qt5 instances have wrong paths in their *.pc files, so we pass the right one to the linker here
    NIM_PARAMS += --passL:"-F$(QT5_LIBDIR)"
   else
-   QT5_PCFILEDIR := $(QTDIR)/gcc_64/lib/pkgconfig
-   QT5_LIBDIR := $(QTDIR)/gcc_64/lib
+   QT5_PCFILEDIR := $(QTDIR)/lib/pkgconfig
+   QT5_LIBDIR := $(QTDIR)/lib
    NIM_PARAMS += --passL:"-L$(QT5_LIBDIR)"
   endif
  endif
@@ -186,7 +186,7 @@ $(APPIMAGE): nim_status_client $(APPIMAGE_TOOL) nim-status.desktop
 	cp -R ui tmp/linux/dist/usr/.
 
 	echo -e $(BUILD_MSG) "AppImage"
-	linuxdeployqt tmp/linux/dist/nim-status.desktop -no-translations -no-copy-copyright-files -qmldir=tmp/linux/dist/usr/ui -qmlimport=${QTDIR}/gcc_64/qml -bundle-non-qt-libs
+	linuxdeployqt tmp/linux/dist/nim-status.desktop -no-translations -no-copy-copyright-files -qmldir=tmp/linux/dist/usr/ui -qmlimport=$(QTDIR)/qml -bundle-non-qt-libs
 
 	rm tmp/linux/dist/AppRun
 	cp AppRun tmp/linux/dist/.
diff --git a/docker-linux-app-image.sh b/docker-linux-app-image.sh
index 7bc566bffa..5780168770 100755
--- a/docker-linux-app-image.sh
+++ b/docker-linux-app-image.sh
@@ -19,9 +19,9 @@ export PATH="/usr/local/go/bin:${PATH}"
 # $QT_PATH/$QT_VERSION/$QT_PLATFORM/bin is already prepended to $PATH
 # However $QT_VERSION is not exposed to environment so set it here
 export QT_VERSION=$(basename $(echo "${QT_PATH}/*"))
-export QTDIR="${QT_PATH}/${QT_VERSION}"
+export QTDIR="${QT_PATH}/${QT_VERSION}/${QT_PLATFORM}"
 # $OPENSSL_PREFIX is provided by the docker image
 export LIBRARY_PATH="${OPENSSL_PREFIX}/lib:${LIBRARY_PATH}"
-export LD_LIBRARY_PATH="${QTDIR}/${QT_PLATFORM}/lib:${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="${QTDIR}/lib:${LD_LIBRARY_PATH}"
 make clean; git clean -dfx && rm -rf vendor/*
 make pkg V=1
diff --git a/docs/building.md b/docs/building.md
index 64bba24c99..62629284f8 100644
--- a/docs/building.md
+++ b/docs/building.md
@@ -36,12 +36,12 @@ brew install go
 
 ```
 # Linux users should use their distro's package manager, but in case they do a manual install:
-export PATH=$PATH:/path/to/Qt/5.14.2/gcc_64/bin
-export QTDIR=/path/to/Qt/5.14.2/
+export QTDIR="/path/to/Qt/5.14.2/gcc_64"
+export PATH="${QTDIR}/bin:${PATH}"
 
 # macOS:
-export PATH=$PATH:/path/to/Qt/5.14.2/clang_64/bin
-export QTDIR=/path/to/Qt/5.14.2/
+export QTDIR="/path/to/Qt/5.14.2/clang_64"
+export PATH="${QTDIR}/bin:${PATH}"
 ```
 
 ### 2. Clone the repo and build `nim-status-client`