diff --git a/include/helper_show b/include/helper_show
index 6cc9d0c3..4caaebeb 100644
--- a/include/helper_show
+++ b/include/helper_show
@@ -29,6 +29,7 @@
 ######################################################################
 
 COMMANDS="audit show update"
+HELPERS="audit configure show update"
 OPTIONS="--auditor\n--check-all (-c)\n--config\n--cronjob (--cron)\n--debug\n--developer\n--help (-h)\n--info\n--license-key --log-file\n--manpage_(--man)\n--no-colors --no-log\n--pentest\n--profile\n--plugins-dir\n--quiet (-q)\n--quick (-Q)\n--report-file\n--reverse-colors\n--tests\n--tests-category\n--upload\n--verbose\n--version (-V)\n--view-categories"
 
 SHOW_ARGS="commands dbdir help includedir license man options pidfile plugindir profiles release releasedate tests version workdir"
@@ -158,6 +159,7 @@ if [ $# -gt 0 ]; then
                 esac
             fi
             ;;
+        "helpers")              for I in ${HELPERS}; do ${ECHOCMD} ${I}; done ;;
         "includedir")
             ${ECHOCMD} "${INCLUDEDIR}"
             ;;
@@ -166,6 +168,7 @@ if [ $# -gt 0 ]; then
         "options")              ${ECHOCMD} "${OPTIONS}" ;;
         "pidfile")              ${ECHOCMD} "${PIDFILE}" ;;
         "profile" | "profiles") for I in ${PROFILES}; do ${ECHOCMD} ${I}; done ;;
+        "profiledir")           ${ECHOCMD} "${PROFILEDIR}" ;;
         "plugindir")            ${ECHOCMD} "${PLUGINDIR}" ;;
         "release" | "version")  ${ECHOCMD} "${PROGRAM_VERSION}" ;;
         "releasedate")          ${ECHOCMD} "${PROGRAM_RELEASE_DATE}" ;;
diff --git a/lynis b/lynis
index 8fc594b9..57bc6574 100755
--- a/lynis
+++ b/lynis
@@ -267,6 +267,7 @@ ${NORMAL}
     if [ "${PROFILE}" = "" ]; then
         CUSTOM_PROFILE=""
         DEFAULT_PROFILE=""
+        PROFILEDIR=""
         tPROFILE_NAMES="default.prf custom.prf"
         tPROFILE_TARGETS="/usr/local/etc/lynis /etc/lynis /usr/local/lynis ."
         for PNAME in ${tPROFILE_NAMES}; do
@@ -277,13 +278,15 @@ ${NORMAL}
                 elif [ "${PNAME}" = "custom.prf" -a ! "${CUSTOM_PROFILE}" = "" ]; then
                   Debug "Already discovered custom.prf - skipping this file (${PLOC}/${PNAME})"
                   else
-                    FILE="${PLOC}/${PNAME}"
+                    if [ "${PLOC}" = "." ]; then FILE="${WORKDIR}/${PNAME}"; else FILE="${PLOC}/${PNAME}"; fi
                     if [ -r ${FILE} ]; then
                         PROFILES="${PROFILES} ${FILE}"
                         case ${PNAME} in
                             "custom.prf") CUSTOM_PROFILE="${FILE}" ;;
                             "default.prf") DEFAULT_PROFILE="${FILE}" ;;
                         esac
+                        # Set profile directory to last match (Lynis could be both installed, and run as a separate download)
+                        if [ "${PLOC}" = "." ]; then PROFILEDIR="${WORKDIR}"; else PROFILEDIR="${PLOC}"; fi
                     fi
                 fi
             done