diff --git a/share/completions/aptitude.fish b/share/completions/aptitude.fish
index a4f19c423..44970155f 100644
--- a/share/completions/aptitude.fish
+++ b/share/completions/aptitude.fish
@@ -2,7 +2,7 @@
 
 function __fish_apt_no_subcommand  --description 'Test if aptitude has yet to be given the subcommand'
 	for i in (commandline -opc)
-		if contains -- $i autoclean clean forget-new keep-all update upgrade changelog dist-upgrade download forbid-version hold install keep markauto purge reinstall remove show unhold unmarkauto search help
+		if contains -- $i autoclean clean forget-new keep-all update safe-upgrade changelog full-upgrade download forbid-version hold install keep markauto purge reinstall remove show unhold unmarkauto search help
 			return 1
 		end
 	end
@@ -11,7 +11,7 @@ end
 
 function __fish_apt_use_package  --description 'Test if aptitude command should have packages as potential completion'
 	for i in (commandline -opc)
-		if contains -- $i changelog dist-upgrade download forbid-version hold install keep-all markauto purge reinstall remove show unhold unmarkauto
+		if contains -- $i changelog full-upgrade download forbid-version hold install keep-all markauto purge reinstall remove show unhold unmarkauto
 			return 0
 		end
 	end
@@ -26,9 +26,9 @@ complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'clean'  --description
 complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forget-new'  --description 'Forget all internal information about what packages are \'new\''
 complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'keep-all'  --description 'Cancel all scheduled actions on all packages'
 complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'update'  --description 'Update the list of available packages from the apt sources'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'upgrade'  --description 'Upgrade installed packages to their most recent version'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'safe-upgrade'  --description 'Upgrade installed packages to their most recent version'
 complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'changelog'  --description 'Download and displays the Debian changelog for the packages'
-complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'dist-upgrade'  --description 'Upgrade, removing or installing packages as necessary'
+complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'full-upgrade'  --description 'Upgrade, removing or installing packages as necessary'
 complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'download'  --description 'Download the packages to the current directory'
 complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'forbid-version'  --description 'Forbid the upgrade to a particular version'
 complete -f -n '__fish_apt_no_subcommand' -c aptitude -a 'hold'  --description 'Ignore the packages by future upgrade commands'