diff --git a/src/share/classes/javax/swing/UIManager.java b/src/share/classes/javax/swing/UIManager.java
index ce8e6ce..3c35d0f 100644
--- a/src/share/classes/javax/swing/UIManager.java
+++ b/src/share/classes/javax/swing/UIManager.java
@@ -608,7 +608,7 @@ public class UIManager implements Serializable
                 // May be set on Linux and Solaris boxs.
                 return "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
             }
-            if (osType == OSInfo.OSType.SOLARIS) {
+            if (osType == OSInfo.OSType.SOLARIS || osType == OSInfo.OSType.AIX) {
                 return "com.sun.java.swing.plaf.motif.MotifLookAndFeel";
             }
         }
diff --git a/src/share/classes/sun/awt/OSInfo.java b/src/share/classes/sun/awt/OSInfo.java
index c8cce59..8ac5b43 100644
--- a/src/share/classes/sun/awt/OSInfo.java
+++ b/src/share/classes/sun/awt/OSInfo.java
@@ -39,6 +39,7 @@ public class OSInfo {
         WINDOWS,
         LINUX,
         SOLARIS,
+        AIX,
         UNKNOWN
     }
 
@@ -101,6 +102,9 @@ public class OSInfo {
             }
 
             // determine another OS here
+            if(osName.contains("AIX")) {
+            	return AIX;
+            }
         }
 
         return UNKNOWN;