diff --git a/makedebian.pl b/makedebian.pl
index 74d2e10ec..90b569ee5 100755
--- a/makedebian.pl
+++ b/makedebian.pl
@@ -477,16 +477,18 @@ foreach my $deb ("deb", "newkey/deb") {
 
 	# Create the .dsc file
 	open(DSC, ">$deb/${product}_$ver$rel.plain");
+	# Check if DEB_MAINTAINER is set and use it otherwise use Jamie Cameron <jcameron\@webmin.com>
+	$deb_maintainer = $ENV{'DEB_MAINTAINER'} || "Jamie Cameron <jcameron\@webmin.com>";
 	print DSC <<EOF;
 Format: 1.0
 Source: $product
 Version: $ver$rel
 Binary: $product
-Maintainer: Jamie Cameron <jcameron\@webmin.com>
 Architecture: all
 Standards-Version: 3.6.1
 Build-Depends-Indep: debhelper (>= 4.1.16), debconf (>= 0.5.00), perl
-Uploaders: Jamie Cameron <jcameron\@webmin.com>
+Maintainer: $deb_maintainer
+Uploaders: $deb_maintainer
 Files:
  $md5 $st[7] ${product}-${ver}.tar.gz
  $diffmd5 $diffst[7] ${product}_${ver}.diff
diff --git a/makerpm.pl b/makerpm.pl
index 33d0aab23..239e8576b 100755
--- a/makerpm.pl
+++ b/makerpm.pl
@@ -76,6 +76,7 @@ else {
 
 system("cp tarballs/$tarfile $source_dir");
 open(SPEC, ">$spec_dir/webmin-$ver.spec");
+$rpm_maintainer = $ENV{'RPM_MAINTAINER'} || "Jamie Cameron";
 print SPEC <<EOF;
 %global __perl_provides %{nil}
 %define __spec_install_post %{nil}
@@ -92,7 +93,7 @@ AutoReq: 0
 License: BSD-3-clause
 Group: System/Tools
 Source: http://www.webmin.com/download/$tarfile
-Vendor: Jamie Cameron
+Vendor: $rpm_maintainer
 BuildRoot: /tmp/%{name}-%{version}
 BuildArchitectures: noarch
 %description