diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bbc9054..c787304 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,6 @@ name: Build and run tests
 
 on:
   push:
-    branches: [ "master" ]
   pull_request:
 
 jobs:
@@ -147,3 +146,23 @@ jobs:
       - name: Test
         run: cd ${{ github.workspace }}/build && env ${{ matrix.env }} ctest --output-on-failure
 
+
+  installation_check:
+    runs-on: ubuntu-24.04
+    
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get -q -q update
+          sudo apt-get install -q -q -y make cmake git g++
+
+      - name: Configure
+        run: cmake -S . -B ./build/to_install -DCMAKE_INSTALL_PREFIX=./install_dir -DCMAKE_SKIP_INSTALL_RULES=0
+
+      - name: Install in a folder
+        run: cmake --install ./build/to_install
+
+      - name: Test if usable
+        run: cmake -S . -B ./build/to_try_use_installed -DCORRAL_TEST_INSTALLED_VERSION=1 -DCMAKE_PREFIX_PATH=./install_dir
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee06f66..2b1d4e5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,50 +1,39 @@
-cmake_minimum_required(VERSION 3.0)
-project(corral)
+cmake_minimum_required(VERSION 3.10)
+
+set(THE_CORRAL_VERSION 1.0.0)
+
+if(CORRAL_TEST_INSTALLED_VERSION)
+  find_package(corral ${THE_CORRAL_VERSION} REQUIRED)
+
+  message("corral_FOUND: ${corral_FOUND}")
+
+  add_library(dummy_target INTERFACE)
+
+  target_link_libraries(dummy_target INTERFACE corral::corral)
+
+  find_package(PkgConfig)
+
+  pkg_check_modules(corral GLOBAL IMPORTED_TARGET corral)
+
+  add_library(dummy_target2 INTERFACE)
+
+  target_link_libraries(dummy_target2 INTERFACE PkgConfig::corral)
+  return()
+endif()
+
+project(corral VERSION ${THE_CORRAL_VERSION})
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
-add_library(
-  corral
-  INTERFACE
-  corral/asio.h
-  corral/CBPortal.h
-  corral/Channel.h
-  corral/concepts.h
-  corral/config.h
-  corral/defs.h
-  corral/Event.h
-  corral/Executor.h
-  corral/corral.h
-  corral/Nursery.h
-  corral/ParkingLot.h
-  corral/run.h
-  corral/Semaphore.h
-  corral/Shared.h
-  corral/Task.h
-  corral/ThreadPool.h
-  corral/utility.h
-  corral/Value.h
-  corral/wait.h
-  corral/detail/ABI.h
-  corral/detail/exception.h
-  corral/detail/frames.h
-  corral/detail/introspect.h
-  corral/detail/IntrusiveList.h
-  corral/detail/IntrusivePtr.h
-  corral/detail/ParkingLot.h
-  corral/detail/platform.h
-  corral/detail/PointerBits.h
-  corral/detail/Promise.h
-  corral/detail/Queue.h
-  corral/detail/ScopeGuard.h
-  corral/detail/TaskAwaiter.h
-  corral/detail/utility.h
-  corral/detail/wait.h
-)
+add_library(corral INTERFACE)
+add_library(corral::corral ALIAS corral)
 
-target_include_directories(corral INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(
+  corral INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+                   $<INSTALL_INTERFACE:include>
+)
 
 if(BUILD_TESTING)
 
@@ -142,12 +131,58 @@ endif()
 # Installation
 #
 
-install(DIRECTORY corral DESTINATION include)
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+
+install(DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
 install(
-  TARGETS corral
-  EXPORT corralTargets
-  INCLUDES
-  DESTINATION include
+  TARGETS ${PROJECT_NAME}
+  EXPORT ${PROJECT_NAME}Targets
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+install(
+  EXPORT ${PROJECT_NAME}Targets
+  DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}/
+  NAMESPACE ${PROJECT_NAME}::
+)
+
+file(WRITE "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake.in"
+  "@PACKAGE_INIT@\ninclude(\$\{CMAKE_CURRENT_LIST_DIR\}/${PROJECT_NAME}Targets.cmake)"
+)
+
+configure_package_config_file(
+  ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake.in
+  ${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+  INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}
+)
+
+install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}
+)
+
+write_basic_package_version_file(
+  ${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+  VERSION ${PROJECT_VERSION}
+  COMPATIBILITY AnyNewerVersion ARCH_INDEPENDENT
+)
+
+install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}
+)
+
+file(
+  GENERATE
+  OUTPUT "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc"
+  CONTENT
+    "prefix=${CMAKE_INSTALL_PREFIX}\nincludedir=\$\{prefix\}/include\nName: ${PROJECT_NAME}\nDescription: Lightweight structured concurrency for C++20\nVersion: ${PROJECT_VERSION}\nCflags: -I\$\{includedir\}\n"
+)
+
+install(FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc"
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig
 )
 
 #