--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,6 +43,8 @@
 
 message(STATUS "FreeDV version: ${FREEDV_VERSION}")
 
+set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_SOURCE_DIR}/Build/usr/  ${CMAKE_SOURCE_DIR}/Build/ )
+
 # Work around for not using a svn working copy.
 add_definitions(-D_NO_AUTOTOOLS_)
 find_program(SVNVERSION_PATH svnversion)
@@ -241,11 +243,11 @@
     include(cmake/BuildPortaudio.cmake)
 endif(NOT USE_STATIC_PORTAUDIO)
 # Do we need this?
-find_library(PORTAUDIOCPP portaudiocpp)
-if(PORTAUDIOCPP)
-    message(STATUS "portaudiocpp library: ${PORTAUDIOCPP}")
-    list(APPEND FREEDV_LINK_LIBS ${PORTAUDIOCPP})
-endif(PORTAUDIOCPP)
+#find_library(PORTAUDIOCPP portaudiocpp)
+#if(PORTAUDIOCPP)
+#    message(STATUS "portaudiocpp library: ${PORTAUDIOCPP}")
+#    list(APPEND FREEDV_LINK_LIBS ${PORTAUDIOCPP})
+#endif(PORTAUDIOCPP)
 
 #
 # Hamlib library
@@ -345,15 +347,22 @@
 #
 # Find wxWidgets
 #
+if(EXISTS "${CMAKE_SOURCE_DIR}/wxwidgets" AND IS_DIRECTORY "${CMAKE_SOURCE_DIR}/wxwidgets")
+    # Debian source package convenience copy
+    set(WXCONFIG "${CMAKE_SOURCE_DIR}/Build/usr/bin/wx-config")
+    set(WXRC "${CMAKE_SOURCE_DIR}/Build/usr/bin/wxrc")
+    list(APPEND FREEDV_STATIC_DEPS wxWidgets)
+else(EXISTS "${CMAKE_SOURCE_DIR}/wxwidgets" AND IS_DIRECTORY "${CMAKE_SOURCE_DIR}/wxwidgets")
 if(NOT BOOTSTRAP_WXWIDGETS)
     set(WXCONFIG "" CACHE FILEPATH "Location of wx-config binary.")
     set(WXRC "" CACHE FILEPATH "Location of wxrc binary.")
 endif(NOT BOOTSTRAP_WXWIDGETS)
-#if(BOOTSTRAP_WXWIDGETS)
-#    set(WXCONFIG "${CMAKE_BINARY_DIR}/external/dist/bin/wx-config")
-#    set(WXRC "${CMAKE_BINARY_DIR}/external/dist/bin/wxrc")
-#    list(APPEND FREEDV_STATIC_DEPS wxWidgets)
-#endif(BOOTSTRAP_WXWIDGETS)
+if(BOOTSTRAP_WXWIDGETS)
+    set(WXCONFIG "${CMAKE_BINARY_DIR}/external/dist/bin/wx-config")
+    set(WXRC "${CMAKE_BINARY_DIR}/external/dist/bin/wxrc")
+    list(APPEND FREEDV_STATIC_DEPS wxWidgets)
+endif(BOOTSTRAP_WXWIDGETS)
+endif(EXISTS "${CMAKE_SOURCE_DIR}/wxwidgets" AND IS_DIRECTORY "${CMAKE_SOURCE_DIR}/wxwidgets")
 message(STATUS "Looking for wxWidgets...")
 if(WXCONFIG)
     message(STATUS "wx-config: ${WXCONFIG}")
