diff --git a/pjmedia/build/Makefile b/pjmedia/build/Makefile
index dae6d61..49cd942 100644
--- a/pjmedia/build/Makefile
+++ b/pjmedia/build/Makefile
@@ -1,7 +1,6 @@
 include ../../build.mak
 
 THIRD_PARTY:=$(PJDIR)/third_party
-PA_DIR := $(THIRD_PARTY)/build/portaudio/src
 
 SRTP_INC=$(CC_INC)$(THIRD_PARTY)/build/srtp \
 	 $(CC_INC)$(THIRD_PARTY)/srtp/crypto/include \
diff --git a/pjmedia/build/os-auto.mak.in b/pjmedia/build/os-auto.mak.in
index 5b80ea2..a7a153e 100644
--- a/pjmedia/build/os-auto.mak.in
+++ b/pjmedia/build/os-auto.mak.in
@@ -86,7 +86,13 @@
 # PortAudio
 #
 ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),)
+ifeq (x@ac_pa_path@,x)
+# Our PA in third_party
 export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1
+else
+# External PA
+export CFLAGS += -I@ac_pa_path@/include -DPJMEDIA_AUDIO_DEV_HAS_PORTAUDIO=1
+endif
 endif
 
 #
diff --git a/pjmedia/src/pjmedia-audiodev/pa_dev.c b/pjmedia/src/pjmedia-audiodev/pa_dev.c
index 53cca04..095f772 100644
--- a/pjmedia/src/pjmedia-audiodev/pa_dev.c
+++ b/pjmedia/src/pjmedia-audiodev/pa_dev.c
@@ -30,6 +30,11 @@
 #define THIS_FILE	"pa_dev.c"
 #define DRIVER_NAME	"PA"
 
+/* Enable call to PaUtil_SetDebugPrintFunction, but this is not always
+ * available across all PortAudio versions (?)
+ */
+/*#define USE_PA_DEBUG_PRINT */
+
 struct pa_aud_factory
 {
     pjmedia_aud_dev_factory	 base;
@@ -404,6 +409,7 @@
     return rc;
 }
 
+#ifdef USE_PA_DEBUG_PRINT
 /* Logging callback from PA */
 static void pa_log_cb(const char *log)
 {
@@ -415,6 +421,7 @@
  */
 typedef void (*PaUtilLogCallback ) (const char *log);
 void PaUtil_SetDebugPrintFunction(PaUtilLogCallback  cb);
+#endif
 
 
 /*
@@ -442,7 +449,9 @@
 
     PJ_UNUSED_ARG(f);
 
+#ifdef USE_PA_DEBUG_PRINT
     PaUtil_SetDebugPrintFunction(&pa_log_cb);
+#endif
 
     err = Pa_Initialize();