diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 3efcf11f0..5b9530be4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -174,4 +174,4 @@ Fixes:
 ..
   or see older git commits
 
-`15.X Changelog <https://pyav.basswood-io.com/docs/15.1/development/changelog.html>`
+`15.X Changelog <https://pyav.basswood.io/docs/15.1/development/changelog.html>`
diff --git a/README.md b/README.md
index 59e291c74..9ca80440d 100644
--- a/README.md
+++ b/README.md
@@ -78,8 +78,8 @@ Have fun, [read the docs][docs], [come chat with us][discuss], and good luck!
 
 [conda-badge]: https://img.shields.io/conda/vn/conda-forge/av.svg?colorB=CCB39A
 [conda]: https://anaconda.org/conda-forge/av
-[docs-badge]: https://img.shields.io/badge/docs-on%20pyav.basswood--io.com-blue.svg
-[docs]: https://pyav.basswood-io.com
+[docs-badge]: https://img.shields.io/badge/docs-on%20pyav.basswood.io-blue.svg
+[docs]: https://pyav.basswood.io
 [pypi-badge]: https://img.shields.io/pypi/v/av.svg?colorB=CCB39A
 [pypi]: https://pypi.org/project/av
 [discuss]: https://github.com/PyAV-Org/PyAV/discussions
diff --git a/docs/Makefile b/docs/Makefile
index 6654f1062..e12e6f701 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -28,5 +28,5 @@ open:
 	open _build/html/index.html
 
 upload:
-	rsync -avxP --delete _build/html/ root@basswood-io.com:/var/www/pyav/docs/develop
+	rsync -avxP --delete _build/html/ root@basswood.io:/var/www/pyav/docs/develop
 
diff --git a/pyproject.toml b/pyproject.toml
index 54fb5c736..035e4b489 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,7 +44,7 @@ version = {attr = "av.about.__version__"}
 [project.urls]
 "Bug Tracker" = "https://github.com/PyAV-Org/PyAV/issues"
 "Source Code" = "https://github.com/PyAV-Org/PyAV"
-homepage = "https://pyav.basswood-io.com"
+homepage = "https://pyav.basswood.io"
 
 [project.scripts]
 "pyav" = "av.__main__:main"
diff --git a/setup.py b/setup.py
index 4d3475cfe..2cd23d5a8 100644
--- a/setup.py
+++ b/setup.py
@@ -163,7 +163,7 @@ def parse_cflags(raw_flags):
 
 compiler_directives = {
     "c_string_type": "str",
-    "c_string_encoding": "ascii",
+    "c_string_encoding": "utf8",
     "embedsignature": True,
     "binding": False,
     "language_level": 3,
diff --git a/tests/test_dictionary.py b/tests/test_dictionary.py
index e577c7a07..14e698d73 100644
--- a/tests/test_dictionary.py
+++ b/tests/test_dictionary.py
@@ -15,3 +15,12 @@ def test_dictionary() -> None:
     assert d.pop("key") == "value"
     pytest.raises(KeyError, d.pop, "key")
     assert len(d) == 0
+
+
+def test_dictionary_non_ascii() -> None:
+    d = Dictionary()
+    d["café"] = "naïve 日本語 🎵"
+
+    assert d["café"] == "naïve 日本語 🎵"
+    assert "café" in d
+    assert list(d) == ["café"]