diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecce4f0ad..0c2fa267b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,9 +34,9 @@ option(WITH_GUI_TESTS "Enable building of GUI tests" OFF)
 option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated methods." OFF)
 option(WITH_COVERAGE "Use to build with coverage tests. (GCC ONLY)." OFF)
 
-option(WITH_XC_AUTOTYPE "Include Autotype." OFF)
-option(WITH_XC_HTTP "Include KeePassHTTP." OFF)
-option(WITH_XC_YUBIKEY "Include Yubikey support." OFF)
+option(WITH_XC_AUTOTYPE "Include Auto-Type." OFF)
+option(WITH_XC_HTTP "Include KeePassHTTP support." OFF)
+option(WITH_XC_YUBIKEY "Include YubiKey support." OFF)
 
 set(KEEPASSXC_VERSION "2.1.2")
 set(KEEPASSXC_VERSION_NUM "2.1.2")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 380a6c2dd..418f1e798 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -152,8 +152,9 @@ set(keepassx_FORMS
     gui/group/EditGroupWidgetMain.ui
 )
 
-add_feature_info(KeePassHTTP WITH_XC_HTTP "KeePassHTTP support for ChromeIPass and PassIFox")
-add_feature_info(Autotype WITH_XC_AUTOTYPE "Auto-type passwords in Input fields")
+add_feature_info(AutoType WITH_XC_AUTOTYPE "Automatic password typing")
+add_feature_info(KeePassHTTP WITH_XC_HTTP "Browser integration compatible with ChromeIPass and PassIFox")
+add_feature_info(YubiKey WITH_XC_YUBIKEY "YubiKey HMAC-SHA1 challenge-response")
 
 add_subdirectory(http)
 if(WITH_XC_HTTP)