diff --git a/CMakeLists.txt b/CMakeLists.txt
index 125ab5a..b935698 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -241,8 +241,8 @@ install(TARGETS oink solve
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/oink
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/oink
 )
 
 install(EXPORT oink-targets
@@ -254,25 +254,25 @@ install(EXPORT oink-targets
 include(CMakePackageConfigHelpers)
 
 configure_package_config_file(
-    ${CMAKE_SOURCE_DIR}/cmake/oink-config.cmake.in
-    ${CMAKE_BINARY_DIR}/cmake/oink-config.cmake
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/oink-config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/cmake/oink-config.cmake
     INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/oink
 )
 
 write_basic_package_version_file(
-    ${CMAKE_BINARY_DIR}/cmake/oink-config-version.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/cmake/oink-config-version.cmake
     VERSION ${oink_VERSION}
     COMPATIBILITY SameMinorVersion
 )
 
 install(
     FILES
-        ${CMAKE_BINARY_DIR}/cmake/oink-config.cmake
-        ${CMAKE_BINARY_DIR}/cmake/oink-config-version.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/cmake/oink-config.cmake
+        ${CMAKE_CURRENT_BINARY_DIR}/cmake/oink-config-version.cmake
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/oink
 )
 
 export(EXPORT oink-targets
-    FILE ${CMAKE_BINARY_DIR}/cmake/oink-targets.cmake
+    FILE ${CMAKE_CURRENT_BINARY_DIR}/cmake/oink-targets.cmake
     NAMESPACE oink::
 )