diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
index fdacc3ff751de..800d27a6175b4 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3/S3Credentials.java
@@ -44,9 +44,10 @@ public class S3Credentials {
    *                     to talk to them.
    */
   public void initialize(URI uri, Configuration conf) throws IOException {
-    if (uri.getHost() == null) {
-      throw new IllegalArgumentException("Invalid hostname in URI " + uri);
-    }
+	  // How can the s3 url have a host?
+	  if (uri.getAuthority() == null) {
+	        	throw new IllegalArgumentException("Invalid hostname in URI " + uri);
+	  }
     
     String userInfo = uri.getUserInfo();
     if (userInfo != null) {
diff --git a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
index a10d6f284fbea..6c747c38a8b5a 100644
--- a/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
+++ b/hadoop-tools/hadoop-aws/src/main/java/org/apache/hadoop/fs/s3native/Jets3tNativeFileSystemStore.java
@@ -96,7 +96,7 @@ public void initialize(URI uri, Configuration conf) throws IOException {
         MAX_PART_SIZE);
     serverSideEncryptionAlgorithm = conf.get("fs.s3n.server-side-encryption-algorithm");
 
-    bucket = new S3Bucket(uri.getHost());
+    bucket = new S3Bucket(uri.getAuthority());
   }
   
   @Override