diff --git a/cipd b/cipd
index 16a5f64c2..e75f7bfcd 100755
--- a/cipd
+++ b/cipd
@@ -28,7 +28,7 @@ case $UNAME in
     PLAT=mac
     ;;
   *)
-    echo "UNKNOWN OS: $UNAME"
+    echo "cipd not supported on $UNAME"
     exit 1
 esac
 
diff --git a/download_from_google_storage.py b/download_from_google_storage.py
index 4d6266a23..657bc6353 100755
--- a/download_from_google_storage.py
+++ b/download_from_google_storage.py
@@ -34,6 +34,8 @@ PLATFORM_MAPPING = {
     'darwin': 'mac',
     'linux2': 'linux',
     'win32': 'win',
+    'aix6': 'aix',
+    'aix7': 'aix',
 }