diff --git a/conf.d/homeros.mk b/conf.d/homeros.mk
index 51d01fda..f25b30ff 100644
--- a/conf.d/homeros.mk
+++ b/conf.d/homeros.mk
@@ -1,6 +1,6 @@
-
 ifeq (distro,$(IMAGE_CLASS))
 
-distro/homeros-mini: distro/.live-base use/live/textinstall use/homeros use/speech-en; @:
+distro/homeros-mini: distro/.live-base use/live/textinstall \
+	use/homeros use/speech/en use/isohybrid; @:
 
 endif
diff --git a/features.in/speech-en/README b/features.in/speech-en/README
deleted file mode 100644
index 4a354c78..00000000
--- a/features.in/speech-en/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Эта фича полностью подготавливает англоязычный вывод речи на базе
-сервера VoiceMan.
diff --git a/features.in/speech-en/config.mk b/features.in/speech-en/config.mk
deleted file mode 100644
index 75ec7a16..00000000
--- a/features.in/speech-en/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-use/speech-en:
-	@$(call add_feature)
-	@$(call add,THE_LISTS,speech/voiceman)
-	@$(call add,THE_LISTS,speech/en)
-	@$(call add,DEFAULT_SERVICES_ENABLE,voiceman)
diff --git a/features.in/speech-en/live/image-scripts.d/10-rhvoice b/features.in/speech-en/live/image-scripts.d/10-rhvoice
deleted file mode 100755
index f91a1e31..00000000
--- a/features.in/speech-en/live/image-scripts.d/10-rhvoice
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh -e
-
-/bin/ln -s /etc/tts.d/espeak.voiceman /etc/voiceman.d/espeak.output
diff --git a/features.in/speech-ru/README b/features.in/speech-ru/README
deleted file mode 100644
index 96c981b0..00000000
--- a/features.in/speech-ru/README
+++ /dev/null
@@ -1,2 +0,0 @@
-Эта фича полностью подготавливает русскоязычный вывод речи на базе
-сервера VoiceMan.
diff --git a/features.in/speech-ru/config.mk b/features.in/speech-ru/config.mk
deleted file mode 100644
index 4df143f4..00000000
--- a/features.in/speech-ru/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-use/speech-ru:
-	@$(call add_feature)
-	@$(call add,THE_LISTS,speech/voiceman)
-	@$(call add,THE_LISTS,speech/ru)
-	@$(call add,DEFAULT_SERVICES_ENABLE,voiceman)
diff --git a/features.in/speech-ru/live/image-scripts.d/10-amixer b/features.in/speech-ru/live/image-scripts.d/10-amixer
deleted file mode 100755
index feda4c06..00000000
--- a/features.in/speech-ru/live/image-scripts.d/10-amixer
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-cat <<EOF > /etc/rc.d/rc.local
-#!/bin/sh
-
-amixer set Master 75%
-amixer set Master toggle
-amixer set PCM 75%
-amixer set PCM toggle
-
-EOF
-
-chmod 755 /etc/rc.d/rc.local
diff --git a/features.in/speech-ru/live/image-scripts.d/10-rhvoice b/features.in/speech-ru/live/image-scripts.d/10-rhvoice
deleted file mode 100755
index 23c2861a..00000000
--- a/features.in/speech-ru/live/image-scripts.d/10-rhvoice
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-
-/bin/ln -s /etc/tts.d/rhvoice-en.voiceman /etc/voiceman.d/rhvoice-en.output
-/bin/ln -s /etc/tts.d/rhvoice.voiceman /etc/voiceman.d/rhvoice.output
diff --git a/features.in/speech/README b/features.in/speech/README
new file mode 100644
index 00000000..b225c90f
--- /dev/null
+++ b/features.in/speech/README
@@ -0,0 +1,2 @@
+Эта фича полностью подготавливает русскоязычный или англоязычный
+вывод речи на базе сервера VoiceMan.
diff --git a/features.in/speech/config.mk b/features.in/speech/config.mk
new file mode 100644
index 00000000..6e548816
--- /dev/null
+++ b/features.in/speech/config.mk
@@ -0,0 +1,8 @@
+use/speech:
+	@$(call add_feature)
+	@$(call add,THE_LISTS,speech/voiceman speech/$$(SPEECH_LANG))
+	@$(call add,DEFAULT_SERVICES_ENABLE,voiceman)
+	@$(call xport,SPEECH_LANG)
+
+use/speech/en use/speech/ru:  use/speech/%: use/speech
+	@$(call set,SPEECH_LANG,$*)
diff --git a/features.in/speech-en/live/image-scripts.d/10-amixer b/features.in/speech/live/image-scripts.d/10-amixer
similarity index 100%
rename from features.in/speech-en/live/image-scripts.d/10-amixer
rename to features.in/speech/live/image-scripts.d/10-amixer
diff --git a/features.in/speech/live/image-scripts.d/10-voiceman b/features.in/speech/live/image-scripts.d/10-voiceman
new file mode 100755
index 00000000..54904972
--- /dev/null
+++ b/features.in/speech/live/image-scripts.d/10-voiceman
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+
+case "$GLOBAL_SPEECH_LANG" in
+en)
+	ln -s ../tts.d/espeak.voiceman /etc/voiceman.d/espeak.output
+	;;
+ru)
+	ln -s ../tts.d/rhvoice-en.voiceman /etc/voiceman.d/rhvoice-en.output
+	ln -s ../tts.d/rhvoice.voiceman /etc/voiceman.d/rhvoice.output
+	;;
+*)
+	echo "** error: speech feature used with no language chosen" >&2
+	exit 1
+	;;
+esac
diff --git a/pkg.in/lists/speech/ru b/pkg.in/lists/speech/ru
index 2c2c961d..ff647574 100644
--- a/pkg.in/lists/speech/ru
+++ b/pkg.in/lists/speech/ru
@@ -1,3 +1,2 @@
 RHVoice
 textlus-rhvoice
-