diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c836a4..f60acf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,9 @@
 # Copyright 2019 Mike Dev
 # Distributed under the Boost Software License, Version 1.0.
 # See accompanying file LICENSE_1_0.txt or copy at https://www.boost.org/LICENSE_1_0.txt
-#
-# NOTE: CMake support for Boost.Optional is currently experimental at best
-#       and the interface is likely to change in the future
 
-cmake_minimum_required( VERSION 3.5 )
-project( BoostOptional )
+cmake_minimum_required( VERSION 3.5...3.20 )
+project( boost_optional VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX )
 
 add_library( boost_optional INTERFACE )
 add_library( Boost::optional ALIAS boost_optional )