diff --git a/gr3.8.patch b/gr3.8.patch
index 36da7d2..79e532c 100644
--- a/gr3.8.patch
+++ b/gr3.8.patch
@@ -28,10 +28,10 @@ index 56f95f4..c43483a 100644
  add_subdirectory(op25/gr-op25_repeater)
  
 diff --git a/install.sh b/install.sh
-index 10fbeb5..d04038f 100755
+index 10fbeb5..4246447 100755
 --- a/install.sh
 +++ b/install.sh
-@@ -10,9 +10,11 @@ if [ ! -d op25/gr-op25 ]; then
+@@ -10,9 +10,12 @@ if [ ! -d op25/gr-op25 ]; then
  	exit
  fi
  
@@ -41,14 +41,25 @@ index 10fbeb5..d04038f 100755
  sudo apt-get build-dep gnuradio
 -sudo apt-get install gnuradio gnuradio-dev gr-osmosdr librtlsdr-dev libuhd-dev  libhackrf-dev libitpp-dev libpcap-dev cmake git swig build-essential pkg-config doxygen python-numpy python-waitress python-requests
 +sudo apt-get install gnuradio gnuradio-dev gr-osmosdr librtlsdr-dev libuhd-dev  libhackrf-dev libitpp-dev libpcap-dev cmake git swig build-essential pkg-config doxygen python3-numpy python3-waitress python3-requests
++sudo apt-get install liborc-dev
  
  mkdir build
  cd build
 diff --git a/op25/gr-op25/CMakeLists.txt b/op25/gr-op25/CMakeLists.txt
-index 938bd67..110b99c 100644
+index 6c05df5..1c6fa23 100644
 --- a/op25/gr-op25/CMakeLists.txt
 +++ b/op25/gr-op25/CMakeLists.txt
-@@ -93,11 +93,12 @@ find_package(CppUnit)
+@@ -68,6 +68,9 @@ endif()
+ ########################################################################
+ find_package(CppUnit)
+ 
++set(ENABLE_PYTHON "TRUE" CACHE BOOL "enable python")
++cmake_policy(SET CMP0012 NEW)
++
+ # To run a more advanced search for GNU Radio and it's components and
+ # versions, use the following. Add any components required to the list
+ # of GR_REQUIRED_COMPONENTS (in all caps) and change "version" to the
+@@ -76,11 +79,12 @@ find_package(CppUnit)
  # set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS FILTER ...)
  # find_package(Gnuradio "version")
  set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS FILTER PMT)
@@ -125,10 +136,20 @@ index e99226f..fd7bd85 100644
  ########################################################################
  # Install swig .i files for development
 diff --git a/op25/gr-op25_repeater/CMakeLists.txt b/op25/gr-op25_repeater/CMakeLists.txt
-index 9962ba3..317c8c3 100644
+index fa29b9e..dc1d8e7 100644
 --- a/op25/gr-op25_repeater/CMakeLists.txt
 +++ b/op25/gr-op25_repeater/CMakeLists.txt
-@@ -92,11 +92,12 @@ find_package(CppUnit)
+@@ -68,6 +68,9 @@ endif()
+ ########################################################################
+ find_package(CppUnit)
+ 
++set(ENABLE_PYTHON "TRUE" CACHE BOOL "enable python")
++cmake_policy(SET CMP0012 NEW)
++
+ # To run a more advanced search for GNU Radio and it's components and
+ # versions, use the following. Add any components required to the list
+ # of GR_REQUIRED_COMPONENTS (in all caps) and change "version" to the
+@@ -75,11 +78,12 @@ find_package(CppUnit)
  #
  set(GR_REQUIRED_COMPONENTS RUNTIME BLOCKS FILTER PMT)
  # find_package(Gnuradio "version")
@@ -146,7 +167,7 @@ index 9962ba3..317c8c3 100644
      message(FATAL_ERROR "CppUnit required to compile op25_repeater")
  endif()
 diff --git a/op25/gr-op25_repeater/apps/audio.py b/op25/gr-op25_repeater/apps/audio.py
-index d5ec354..e68ce33 100755
+index 26cbe4f..255812f 100755
 --- a/op25/gr-op25_repeater/apps/audio.py
 +++ b/op25/gr-op25_repeater/apps/audio.py
 @@ -1,4 +1,4 @@
@@ -156,7 +177,7 @@ index d5ec354..e68ce33 100755
  # Copyright 2017, 2018 Graham Norbury
  # 
 diff --git a/op25/gr-op25_repeater/apps/http_server.py b/op25/gr-op25_repeater/apps/http_server.py
-index cf838df..484dc30 100755
+index f402353..f4b047f 100755
 --- a/op25/gr-op25_repeater/apps/http_server.py
 +++ b/op25/gr-op25_repeater/apps/http_server.py
 @@ -1,4 +1,4 @@
@@ -166,7 +187,7 @@ index cf838df..484dc30 100755
  # Copyright 2017, 2018, 2019, 2020 Max H. Parke KA1RBI
  # 
 diff --git a/op25/gr-op25_repeater/apps/multi_rx.py b/op25/gr-op25_repeater/apps/multi_rx.py
-index 308afc6..27f5eac 100755
+index e4c71ca..42625f5 100755
 --- a/op25/gr-op25_repeater/apps/multi_rx.py
 +++ b/op25/gr-op25_repeater/apps/multi_rx.py
 @@ -1,4 +1,4 @@
@@ -176,7 +197,7 @@ index 308afc6..27f5eac 100755
  # Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Max H. Parke KA1RBI
  # 
 diff --git a/op25/gr-op25_repeater/apps/rx.py b/op25/gr-op25_repeater/apps/rx.py
-index e13eb4d..b594315 100755
+index c671120..b226f8a 100755
 --- a/op25/gr-op25_repeater/apps/rx.py
 +++ b/op25/gr-op25_repeater/apps/rx.py
 @@ -1,4 +1,4 @@
@@ -186,7 +207,7 @@ index e13eb4d..b594315 100755
  # Copyright 2008-2011 Steve Glass
  # 
 diff --git a/op25/gr-op25_repeater/apps/sockaudio.py b/op25/gr-op25_repeater/apps/sockaudio.py
-index c5d4144..0c00413 100755
+index 76282ac..68c6adb 100755
 --- a/op25/gr-op25_repeater/apps/sockaudio.py
 +++ b/op25/gr-op25_repeater/apps/sockaudio.py
 @@ -1,4 +1,4 @@
@@ -196,7 +217,7 @@ index c5d4144..0c00413 100755
  # Copyright 2017, 2018 Graham Norbury
  # 
 diff --git a/op25/gr-op25_repeater/apps/terminal.py b/op25/gr-op25_repeater/apps/terminal.py
-index 47572a3..fd03e1f 100755
+index c732a3a..fa73af4 100755
 --- a/op25/gr-op25_repeater/apps/terminal.py
 +++ b/op25/gr-op25_repeater/apps/terminal.py
 @@ -1,4 +1,4 @@
@@ -226,7 +247,7 @@ index f4b06d9..de3eb28 100755
  from p25craft import make_fakecc_tsdu
  
 diff --git a/op25/gr-op25_repeater/apps/tx/multi_tx.py b/op25/gr-op25_repeater/apps/tx/multi_tx.py
-index 0789db8..f61c382 100755
+index a54bc01..1707502 100755
 --- a/op25/gr-op25_repeater/apps/tx/multi_tx.py
 +++ b/op25/gr-op25_repeater/apps/tx/multi_tx.py
 @@ -1,4 +1,4 @@