diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2331fa2d46..eca52b0c3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -371,11 +371,11 @@ endif()
 set(toxcore_PKGCONFIG_REQUIRES ${toxcore_PKGCONFIG_REQUIRES} libsodium)
 set(toxcore_API_HEADERS
   ${toxcore_SOURCE_DIR}/toxcore/tox.h^tox
-  ${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox
-  ${toxcore_SOURCE_DIR}/toxcore/tox_events.h^tox
   ${toxcore_SOURCE_DIR}/toxcore/tox_options.h^tox)
 if(EXPERIMENTAL_API)
   set(toxcore_API_HEADERS ${toxcore_API_HEADERS}
+    ${toxcore_SOURCE_DIR}/toxcore/tox_dispatch.h^tox
+    ${toxcore_SOURCE_DIR}/toxcore/tox_events.h^tox
     ${toxcore_SOURCE_DIR}/toxcore/tox_private.h^tox)
 endif()
 
diff --git a/other/docker/pkgsrc/pkgsrc.patch b/other/docker/pkgsrc/pkgsrc.patch
index 6d16b8aa84..baa61d5948 100644
--- a/other/docker/pkgsrc/pkgsrc.patch
+++ b/other/docker/pkgsrc/pkgsrc.patch
@@ -14,10 +14,10 @@ diff --git a/chat/toxcore/PLIST b/chat/toxcore/PLIST
 index f0a5e4f04..4122b0867 100644
 --- a/chat/toxcore/PLIST
 +++ b/chat/toxcore/PLIST
-@@ -4,11 +4,12 @@ bin/tox-bootstrapd
+@@ -4,11 +4,10 @@ bin/tox-bootstrapd
  include/tox/tox.h
- include/tox/tox_dispatch.h
- include/tox/tox_events.h
+-include/tox/tox_dispatch.h
+-include/tox/tox_events.h
 +include/tox/tox_options.h
  include/tox/toxav.h
  include/tox/toxencryptsave.h