diff --git a/ports-mgmt/portupgrade/Makefile b/ports-mgmt/portupgrade/Makefile
index 064a343d9abe..4c683242e825 100644
--- a/ports-mgmt/portupgrade/Makefile
+++ b/ports-mgmt/portupgrade/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	portupgrade
 PORTVERSION=	2.4.9.2
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	2
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/
diff --git a/ports-mgmt/portupgrade/files/patch-bin_pkgdb b/ports-mgmt/portupgrade/files/patch-bin_pkgdb
new file mode 100644
index 000000000000..1da54d17a9af
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-bin_pkgdb
@@ -0,0 +1,19 @@
+diff --git a/bin/pkgdb b/bin/pkgdb
+index 34530fe..eae46fa 100755
+--- bin/pkgdb
++++ bin/pkgdb
+@@ -294,10 +294,11 @@ def get_real_run_deps(pkgname)
+     puts "Disclose depends for #{pkgname}" if $verbose
+ 
+     $origins[pkgname] = Hash.new
+-    `cd #{$portsdb.portdir(origin)} && #{shelljoin(*make_env)} make #{shelljoin(*make_args)} package-depends-list`.map { |line|
++    `cd #{$portsdb.portdir(origin)} && #{shelljoin(*make_env)} make #{shelljoin(*make_args)} package-depends-list`.each_line { |line|
++      next if line.empty?
+       a = line.chomp.split(/ /)
+-      $origins[pkgname].store(a[0], a[2])
+-    }.compact
++      $origins[pkgname].store(a[0], a[2]) unless a[0].nil? or a[1].nil?
++    }
+   end
+   $origins[pkgname]
+ end
diff --git a/ports-mgmt/portupgrade/files/patch-lib_portsdb.rb b/ports-mgmt/portupgrade/files/patch-lib_portsdb.rb
new file mode 100644
index 000000000000..2950dd5895e3
--- /dev/null
+++ b/ports-mgmt/portupgrade/files/patch-lib_portsdb.rb
@@ -0,0 +1,13 @@
+diff --git a/lib/portsdb.rb b/lib/portsdb.rb
+index 3d1d757..95ba620 100644
+--- lib/portsdb.rb
++++ lib/portsdb.rb
+@@ -185,7 +185,7 @@ class PortsDB
+   def make_var(var, dir = ports_dir())
+     if var.is_a?(Array)
+       vars = var.join(' -V ')
+-      `cd #{dir} && make -V #{vars} 2>/dev/null`.map { |val|
++      `cd #{dir} && make -V #{vars} 2>/dev/null`.lines.map { |val|
+ 	val.strip!
+ 	if val.empty?
+ 	  nil
diff --git a/ports-mgmt/portupgrade/pkg-plist b/ports-mgmt/portupgrade/pkg-plist
index 1a6f04034652..7e39dcafca61 100644
--- a/ports-mgmt/portupgrade/pkg-plist
+++ b/ports-mgmt/portupgrade/pkg-plist
@@ -36,7 +36,7 @@ share/zsh/site-functions/_pkgtools
 %%EXAMPLESDIR%%/bash/complete.sample
 %%EXAMPLESDIR%%/tcsh/complete.sample
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.md
 @dirrm %%EXAMPLESDIR%%/bash
 @dirrm %%EXAMPLESDIR%%/tcsh
 @dirrm %%EXAMPLESDIR%%