diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ee604af..6046d26 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -29,7 +29,13 @@ if(NOT DEFINED CMAKE_MACOSX_RPATH)
 endif()
 
 add_library(cbor ${SOURCES})
-target_include_directories(cbor PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(cbor PUBLIC
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
+set_target_properties(cbor PROPERTIES EXPORT_NAME libcbor)
+# For vendored builds
+add_library(libcbor::libcbor ALIAS cbor)
 
 # Explicitly link math.h if necessary
 check_function_exists(ldexp LDEXP_AVAILABLE)
@@ -40,7 +46,6 @@ endif()
 include(GenerateExportHeader)
 generate_export_header(cbor EXPORT_FILE_NAME
                        ${CMAKE_CURRENT_BINARY_DIR}/cbor/cbor_export.h)
-target_include_directories(cbor PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cbor/cbor_export.h
         DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/cbor)
 
@@ -65,6 +70,7 @@ configure_file(libcbor.pc.in libcbor.pc @ONLY)
 # http://www.cmake.org/Wiki/CMake:Install_Commands
 install(
   TARGETS cbor
+  EXPORT libcborTargets
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -92,3 +98,6 @@ write_basic_package_version_file(
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcborConfig.cmake
               ${CMAKE_CURRENT_BINARY_DIR}/libcborConfigVersion.cmake
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libcbor)
+install(EXPORT libcborTargets
+        NAMESPACE libcbor::
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libcbor)
diff --git a/src/libcborConfig.cmake.in b/src/libcborConfig.cmake.in
index 565bed3..5c8095c 100644
--- a/src/libcborConfig.cmake.in
+++ b/src/libcborConfig.cmake.in
@@ -2,6 +2,9 @@ set(CBOR_VERSION @CBOR_VERSION@)
 
 @PACKAGE_INIT@
 
+include("${CMAKE_CURRENT_LIST_DIR}/libcborTargets.cmake")
+
+# legacy
 set_and_check(CBOR_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")
 set_and_check(CBOR_INCLUDE_DIRS "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@")