diff --git a/brltty.spec b/brltty.spec
index 4138d2b..147983d 100644
--- a/brltty.spec
+++ b/brltty.spec
@@ -33,7 +33,7 @@
 
 Name: brltty
 Version: %{pkg_version}
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: LGPLv2+
 URL: http://brltty.app/
 Source0: http://brltty.app/archive/%{name}-%{version}.tar.xz
@@ -537,6 +537,10 @@ fi
 %{_prefix}/lib/dracut/modules.d/99brltty/
 
 %changelog
+* Fri Jun  8 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 5.6-20
+- Fixed installation of multiple drivers and text tables in Dracut module
+  if environment variables are used
+
 * Mon Jun  4 2018 Jaroslav Škarvada <jskarvad@redhat.com> - 5.6-19
 - Fixed Dracut module requirements
 
diff --git a/dracut-module-setup.sh b/dracut-module-setup.sh
index b978aa4..43db4ba 100755
--- a/dracut-module-setup.sh
+++ b/dracut-module-setup.sh
@@ -45,13 +45,13 @@ install() {
 
 	if [ "$BRLTTY_DRACUT_INCLUDE_DRIVERS" ]; then
 		for word in $BRLTTY_DRACUT_INCLUDE_DRIVERS; do
-			inst_libdir_file "brltty/libbrltty$BRLTTY_DRACUT_INCLUDE_DRIVERS.so*"
+			inst_libdir_file "brltty/libbrltty$word.so*"
 		done
 	fi
 		
 	if [ "$BRLTTY_DRACUT_INCLUDE_TEXT_FILES" ]; then
 		for word in $BRLTTY_DRACUT_INCLUDE_TEXT_FILES; do
-			inst "/etc/brltty/Text/$BRLTTY_DRACUT_INCLUDE_DATA_FILES"
+			inst "/etc/brltty/Text/$word"
 		done
 	fi