diff --git a/MANIFEST.in b/MANIFEST.in
index f7c92c539524cb53c6c9a23880df80a714efd8a8..c3b81f6a29783a888e2f0907d238322413ff24ea 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -26,3 +26,6 @@ recursive-include tests/data *
 
 # Remove CFFI files
 global-exclude __pycache__/*
+
+# Add PyNaCl header files
+recursive-include src/nacl/_lib *.h
diff --git a/setup.py b/setup.py
index 85865081f1882bc820fad88eb3d08685af84499c..336b1e42b2ee6ae1ce4980f8a315c2ee483c2299 100644
--- a/setup.py
+++ b/setup.py
@@ -213,8 +213,9 @@ setup(
         "nacl._lib",
         "nacl.c",
     ],
+    package_data={"nacl._lib": ["*.h"]},
 
-    ext_package="nacl",
+    ext_package="nacl._lib",
     ext_modules=ext_modules,
 
     cmdclass={
diff --git a/src/nacl/_lib/__init__.py b/src/nacl/_lib/__init__.py
index a54eb05744dee3033dc8458514f10802dc9637c0..e0032a339eb76b21a21f90d2720d33d2aa684953 100644
--- a/src/nacl/_lib/__init__.py
+++ b/src/nacl/_lib/__init__.py
@@ -52,7 +52,7 @@ lib = ffi.verify(
     libraries=["sodium"],
 
     # Our ext_package is nacl so look for it
-    ext_package="nacl.c._lib",
+    ext_package="nacl._lib",
 )