diff --git a/software/debian-lib.pl b/software/debian-lib.pl
index 72103ce62..8d7f11e85 100755
--- a/software/debian-lib.pl
+++ b/software/debian-lib.pl
@@ -84,6 +84,7 @@ push(@rv, $out =~ /Version:\s+(\S+)/i ? $1 : $text{'debian_unknown'});
 push(@rv, $out =~ /Maintainer:\s+(.*)/i ? &html_escape($1)
 					 : $text{'debian_unknown'});
 push(@rv, $text{'debian_unknown'});
+push(@rv, $out =~ /Homepage:\s+(.*)/i ? $1 : undef);
 return @rv;
 }
 
diff --git a/software/lang/en b/software/lang/en
index 5ca1c0746..ac1bb3398 100644
--- a/software/lang/en
+++ b/software/lang/en
@@ -52,6 +52,7 @@ edit_ver=Version
 edit_vend=Vendor
 edit_arch=Architecture
 edit_inst=Installed
+edit_url=URL
 edit_deps=Dependencies
 edit_dname=Depends on
 edit_dtype=Dependency type
diff --git a/software/rpm-lib.pl b/software/rpm-lib.pl
index 44f07e5e3..10acf5bd1 100755
--- a/software/rpm-lib.pl
+++ b/software/rpm-lib.pl
@@ -47,7 +47,7 @@ sub package_info
 {
 local(@rv, @tmp, $d);
 local $n = $_[1] ? "$_[0]-$_[1]" : $_[0];
-&open_execute_command(RPM, "rpm -q $n --queryformat \"%{NAME}\\n%{GROUP}\\n%{ARCH}\\n%{VERSION}-%{RELEASE}\\n%{VENDOR}\\n%{INSTALLTIME}\\n\" 2>/dev/null", 1, 1);
+&open_execute_command(RPM, "rpm -q $n --queryformat \"%{NAME}\\n%{GROUP}\\n%{ARCH}\\n%{VERSION}-%{RELEASE}\\n%{VENDOR}\\n%{INSTALLTIME}\\n%{URL}\\n\" 2>/dev/null", 1, 1);
 @tmp = <RPM>;
 chop(@tmp);
 local $ex = close(RPM);
@@ -55,7 +55,8 @@ if (!@tmp || $tmp[0] =~ /not\s+installed/) { return (); }
 &open_execute_command(RPM, "rpm -q $n --queryformat \"%{DESCRIPTION}\"", 1, 1);
 while(<RPM>) { $d .= $_; }
 close(RPM);
-return ($tmp[0], $tmp[1], $d, $tmp[2], $tmp[3], $tmp[4], &make_date($tmp[5]));
+return ($tmp[0], $tmp[1], $d, $tmp[2], $tmp[3], $tmp[4], &make_date($tmp[5]),
+	$tmp[6]);
 }
 
 # virtual_package_info(package)
diff --git a/software/software-lib.pl b/software/software-lib.pl
index 8ffbdeed9..fdf01cdaa 100755
--- a/software/software-lib.pl
+++ b/software/software-lib.pl
@@ -151,6 +151,13 @@ if ($pinfo[6]) {
 	print &ui_table_row($text{'edit_inst'}, $pinfo[6]);
 	}
 
+if ($pinfo[7]) {
+	# URL
+	print &ui_table_row($text{'edit_url'},
+		&ui_link(&quote_escape($pinfo[7], "'"), &html_escape($pinfo[7]),
+			 undef, " target='_blank'"));
+	}
+
 print &ui_table_end();
 
 # Dependencies, if we can get them