diff --git a/lib/shopt.sh b/lib/shopt.sh
index 9e5f887..f3db853 100644
--- a/lib/shopt.sh
+++ b/lib/shopt.sh
@@ -43,10 +43,19 @@ if [[ ${OMB_CASE_SENSITIVE:-${CASE_SENSITIVE:-}} == true ]]; then
 else
 	# By default, case sensitivity is disabled.
 	bind "set completion-ignore-case on"
-fi
 
-# Treat hyphens and underscores as equivalent
-bind "set completion-map-case on"
+	# Treat hyphens and underscores as equivalent
+	# CASE_SENSITIVE must be off
+	if [[ ! ${OMB_HYPHEN_SENSITIVE-} && ${HYPHEN_INSENSITIVE} ]]; then
+		case $HYPHEN_INSENSITIVE in
+		(true)  OMB_HYPHEN_SENSITIVE=true ;;
+		(false) OMB_HYPHEN_SENSITIVE=false ;;
+		esac
+	fi
+	if [[ ${OMB_HYPHEN_SENSITIVE-} == false ]]; then
+		bind "set completion-map-case on"
+	fi
+fi
 
 # Display matches for ambiguous patterns at first tab press
 bind "set show-all-if-ambiguous on"
diff --git a/templates/bashrc.osh-template b/templates/bashrc.osh-template
index 82be0d1..591a05c 100644
--- a/templates/bashrc.osh-template
+++ b/templates/bashrc.osh-template
@@ -16,7 +16,7 @@ OSH_THEME="font"
 
 # Uncomment the following line to use hyphen-insensitive completion. Case
 # sensitive completion must be off. _ and - will be interchangeable.
-# HYPHEN_INSENSITIVE="true"
+# OMB_HYPHEN_SENSITIVE="false"
 
 # Uncomment the following line to disable bi-weekly auto-update checks.
 # DISABLE_AUTO_UPDATE="true"