diff --git a/debian/changelog b/debian/changelog
index f2e6d919..1703d53e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ byobu (4.18) unreleased; urgency=low
   * debian/control: start suggesting tmux
   * usr/bin/byobu, usr/lib/byobu/.constants:
     - support tmux -V version
+  * usr/lib/byobu/.shutil:
+    - update ec2 detection method
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Wed, 29 Jun 2011 02:26:28 +0000
 
diff --git a/usr/lib/byobu/.shutil b/usr/lib/byobu/.shutil
index 2dc28366..52e8d85b 100755
--- a/usr/lib/byobu/.shutil
+++ b/usr/lib/byobu/.shutil
@@ -108,7 +108,7 @@ metadata_available() {
 	# This is really ugly.  We need a reliable, fast way of determining
 	# if a metadata service is available, that does NOT slow down non-ec2
 	# machines.
-	if grep -qs "^domain ec2.internal" /etc/resolv.conf; then
+	if [ -e /etc/ec2_version ]; then
 		wget -q -O- --timeout=1 http://169.254.169.254 >/dev/null 2>&1
 	else
 		false