diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2976f05..c388cd4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest, ubuntu-latest, macos-latest]
-        python-version: ['2.7','3.5','3.6','3.7','3.8']
+        python-version: ['3.7','3.8', '3.9', '3.10', '3.11']
       fail-fast: false
     steps:
       - uses: actions/checkout@v1
diff --git a/manuf/manuf.py b/manuf/manuf.py
index e5e9193..949e09f 100755
--- a/manuf/manuf.py
+++ b/manuf/manuf.py
@@ -61,7 +61,7 @@ class MacParser(object):
         IOError: If manuf file could not be found.
 
     """
-    MANUF_URL = "https://gitlab.com/wireshark/wireshark/raw/master/manuf"
+    MANUF_URL = "https://www.wireshark.org/download/automated/data/manuf"
     WFA_URL = "https://gitlab.com/wireshark/wireshark/raw/master/wka"
 
     def  __init__(self, manuf_name=None, update=False):
@@ -142,8 +142,8 @@ def update(self, manuf_url=None, wfa_url=None, manuf_name=None, refresh=True):
         # Retrieve the new database
         try:
             response = urlopen(Request(manuf_url, headers={'User-Agent': 'Mozilla'}))
-        except URLError:
-            raise URLError("Failed downloading OUI database")
+        except URLError as e:
+            raise URLError("Failed downloading OUI database") from e
 
         # Parse the response
         if response.code == 200:
@@ -162,8 +162,8 @@ def update(self, manuf_url=None, wfa_url=None, manuf_name=None, refresh=True):
         # Append WFA to new database
         try:
             response = urlopen(Request(wfa_url, headers={'User-Agent': 'Mozilla'}))
-        except URLError:
-            raise URLError("Failed downloading WFA database")
+        except URLError as e:
+            raise URLError("Failed downloading WFA database") from e
 
         # Parse the response
         if response.code == 200:
diff --git a/setup.py b/setup.py
index 4795157..c77f944 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@
 setup(
     name = 'manuf',
     packages = ['manuf'],
-    version = '1.1.5',
+    version = '1.1.6',
     description = 'Parser library for Wireshark\'s OUI database',
     author = 'Michael Huang',
     url = 'https://github.com/coolbho3k/manuf/',