diff --git a/Alien/Package/Rpm.pm b/Alien/Package/Rpm.pm
index 303a055..fd03504 100644
--- a/Alien/Package/Rpm.pm
+++ b/Alien/Package/Rpm.pm
@@ -165,8 +165,8 @@ sub unpack {
 	close RPMLIST;
 	foreach my $file (`cd $workdir; find ./`) {
 		chomp $file;
-		if (! $seenfiles{$file} && -d $file && ! -l $file) {
-			$this->do("chmod 755 $file");
+		if (! $seenfiles{$file} && -d "$workdir/$file" && ! -l "$workdir/$file") {
+			$this->do("chmod 755 $workdir/$file");
 		}
 	}
 
@@ -397,7 +397,7 @@ sub build {
 		$opts="--target ".$this->arch;
 	}
 
-	$opts.=" $ENV{RPMBUILDOPTS}" if exists $ENV{RPMBUILDOPTS};
+	$opts.=" $ENV{RPMBUILDOPT}" if exists $ENV{RPMBUILDOPT};
 	my $command="cd $dir; $buildcmd -bb $opts ".$this->name."-".$this->version."-".$this->release.".spec";
 	my $log=$this->runpipe(1, "$command 2>&1");
 	if ($?) {
diff --git a/alien.pl b/alien.pl
index 005138f..33e0a67 100755
--- a/alien.pl
+++ b/alien.pl
@@ -244,7 +244,7 @@ B<alien> recognizes the following environemnt variables:
 
 =over 4
 
-=item RPMBUILDOPT
+=item RPMBUILDOPTS
 
 Options to pass to rpm when it is building a package.
 
diff --git a/debian/changelog b/debian/changelog
index 04ade82..c989d54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+alien (8.63) unstable; urgency=low
+
+  * Correct code to properly use RPMBUILDOPT (not RPMBUILDOPTS). Closes: #352816
+  * Corrected fix for bug #352810 to look at and chmod the right directories.
+    Closes: #352810
+
+ -- Joey Hess <joeyh@debian.org>  Tue, 14 Feb 2006 13:28:22 -0500
+
 alien (8.62) unstable; urgency=low
 
   * Fix a bug in conffile script extraction from tgz files (caused by return