diff --git a/nyquist/init.lsp b/nyquist/init.lsp
index 9dde9b5a2..8c168e5aa 100644
--- a/nyquist/init.lsp
+++ b/nyquist/init.lsp
@@ -67,3 +67,12 @@
         (error (format nil "(aud-get-info ~a) failed.~%" str)))
     (let ((info-string (first info)))
       (eval-string (quote-string info-string)))))
+
+
+;;; Path to Nyquist .lsp files.
+(setf *NYQ-PATH* (current-path))
+
+;;; Load wrapper functions for aud-do commands.
+;;; If commented out, "aud-do-support.lsp" may be loaded by a plug-in.
+;;; Example: (lisp-loader (strcat *NYQ-PATH* "aud-do-support.lsp"))
+(load "aud-do-support.lsp")
diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp
index f09a42b3d..ec1fca091 100644
--- a/src/effects/nyquist/Nyquist.cpp
+++ b/src/effects/nyquist/Nyquist.cpp
@@ -42,6 +42,7 @@ effects from this one class.
 #include <wx/valgen.h>
 #include <wx/wfstream.h>
 #include <wx/numformatter.h>
+#include <wx/stdpaths.h>
 
 #include "../../AudacityApp.h"
 #include "../../FileException.h"
@@ -673,6 +674,9 @@ bool NyquistEffect::Process()
       mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* \"%s\" 'DATA)\n"), EscapeString(FileNames::DataDir()));
       mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* \"%s\" 'HELP)\n"), EscapeString(FileNames::HtmlHelpDir().RemoveLast()));
       mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* \"%s\" 'TEMP)\n"), EscapeString(FileNames::TempDir()));
+      mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* \"%s\" 'SYS-TEMP)\n"), EscapeString(wxStandardPaths::Get().GetTempDir()));
+      mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* \"%s\" 'DOCUMENTS)\n"), EscapeString(wxStandardPaths::Get().GetDocumentsDir()));
+      mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* \"%s\" 'HOME)\n"), EscapeString(wxGetHomeDir()));
 
       wxArrayString paths = NyquistEffect::GetNyquistSearchPath();
       wxString list;
@@ -684,7 +688,8 @@ bool NyquistEffect::Process()
 
       mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* (list %s) 'PLUGIN)\n"), list);
       mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* (list %s) 'PLUG-IN)\n"), list);
-
+      mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* \"%s\" 'USER-PLUG-IN)\n"),
+                                 EscapeString(FileNames::PlugInDir()));
 
       // Date and time:
       wxDateTime now = wxDateTime::Now();