diff --git a/share/functions/__fish_print_packages.fish b/share/functions/__fish_print_packages.fish
index 95d5d6cae..f732a51ff 100644
--- a/share/functions/__fish_print_packages.fish
+++ b/share/functions/__fish_print_packages.fish
@@ -46,7 +46,7 @@ function __fish_print_packages
 		end
 
 		# Remove package version information from output and pipe into cache file
-		/usr/share/yum-cli/completion-helper.py list all -d 0 -C >$cache_file | cut -d '.' -f 1 | sed '1d' | sed '/^\s/d' | sed -e 's/$/'\t$package'/' &
+		/usr/share/yum-cli/completion-helper.py list all -d 0 -C | sed "s/\..*/\t$package/" >$cache_file &
 	end
 
 	# Rpm is too slow for this job, so we set it up to do completions
@@ -67,7 +67,7 @@ function __fish_print_packages
 		end
 
 		# Remove package version information from output and pipe into cache file
-		rpm -qa | sed -e 's/-[^-]*-[^-]*$//' | sed -e 's/$/'\t$package'/' >$cache_file &
+		rpm -qa |sed -e 's/-[^-]*-[^-]*$/\t'$package'/' >$cache_file &
 	end
 
 	# This completes the package name from the portage tree.