diff --git a/Alien/Package/Deb.pm b/Alien/Package/Deb.pm
index b4ba4e1..67d5d96 100644
--- a/Alien/Package/Deb.pm
+++ b/Alien/Package/Deb.pm
@@ -683,7 +683,7 @@ sub email {
 		close MAILNAME;
 	}
 	if (!$mailname) {
-		$mailname=$this->runpipe(1, "hostname -f");
+		$mailname=$this->runpipe(1, "hostname");
 		chomp $mailname;
 	}
 	return "$login\@$mailname";
diff --git a/debian/changelog b/debian/changelog
index 8ac1481..e5b70fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alien (8.76) UNRELEASED; urgency=low
+
+  * Avoid using hostname -f for portability to unix systems,
+    such as Solaris, where any options _set_ the hostname.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 29 May 2009 13:02:54 -0400
+
 alien (8.75) unstable; urgency=low
 
   * Simplified rules file.