diff -Nru vim-addon-manager-0.5.9/bin/vim-addon-manager vim-addon-manager-0.5.10/bin/vim-addon-manager
--- vim-addon-manager-0.5.9/bin/vim-addon-manager	2018-07-11 23:58:48.000000000 +0000
+++ vim-addon-manager-0.5.10/bin/vim-addon-manager	2019-02-24 22:22:54.000000000 +0000
@@ -199,7 +199,7 @@
     :registry_dir => '/usr/share/vim/registry',
     :source_dir   => '/usr/share/vim/addons',
     :system_dir   => '/var/lib/vim/addons',
-    :target_dir   => File.join(ENV['HOME'] || (Etc.getpwnam Etc.getlogin).dir, '.vim'),
+    :target_dir   => File.join(ENV['HOME'] || Etc.getpwuid.dir, '.vim'),
     :query        => false,
     :system_wide  => false,
   }
diff -Nru vim-addon-manager-0.5.9/debian/changelog vim-addon-manager-0.5.10/debian/changelog
--- vim-addon-manager-0.5.9/debian/changelog	2018-07-11 23:58:48.000000000 +0000
+++ vim-addon-manager-0.5.10/debian/changelog	2019-02-24 22:22:54.000000000 +0000
@@ -1,3 +1,10 @@
+vim-addon-manager (0.5.10) unstable; urgency=medium
+
+  * Improve usage of Etc module (Closes: #923152)
+  * cucumber: run against system binaries under autopkgtest
+
+ -- Antonio Terceiro <terceiro@debian.org>  Sun, 24 Feb 2019 19:22:54 -0300
+
 vim-addon-manager (0.5.9) unstable; urgency=medium
 
   [ Ville Skyttä ]
diff -Nru vim-addon-manager-0.5.9/features/step_definitions/steps.rb vim-addon-manager-0.5.10/features/step_definitions/steps.rb
--- vim-addon-manager-0.5.9/features/step_definitions/steps.rb	2018-07-11 23:58:48.000000000 +0000
+++ vim-addon-manager-0.5.10/features/step_definitions/steps.rb	2019-02-24 22:22:54.000000000 +0000
@@ -7,7 +7,11 @@
 source = File.join($sources_root, 'spec/data/scripts')
 
 def program_path(program)
-  File.join($sources_root, 'bin', program)
+  if ENV['AUTOPKGTEST_TMP']
+    ['-S', program]
+  else
+    File.join($sources_root, 'bin', program)
+  end
 end
 
 Before do
@@ -19,7 +23,7 @@
 end
 
 When /^I run `(\S+) (.*)`$/ do |program, args|
-  command = [ruby, "-I#{libdir}", program_path(program), '--silent', '--registry-dir', registry, '--source-dir', source, '--target-dir', $tmpdir]
+  command = [ruby, "-I#{libdir}", *program_path(program), '--silent', '--registry-dir', registry, '--source-dir', source, '--target-dir', $tmpdir]
   args.split.each { |a| command << a }
 
   stdout = File.join($tmpdir, 'stdout')
diff -Nru vim-addon-manager-0.5.9/lib/vim/addon_manager/version.rb vim-addon-manager-0.5.10/lib/vim/addon_manager/version.rb
--- vim-addon-manager-0.5.9/lib/vim/addon_manager/version.rb	2018-07-11 23:58:48.000000000 +0000
+++ vim-addon-manager-0.5.10/lib/vim/addon_manager/version.rb	2019-02-24 22:22:54.000000000 +0000
@@ -1,5 +1,5 @@
 module Vim
   class AddonManager
-    VERSION = '0.5.9'
+    VERSION = '0.5.10'
   end
 end