--- old/src/os/aix/vm/os_aix.cpp	2013-05-14 19:28:31.779223084 +0200
+++ new/src/os/aix/vm/os_aix.cpp	2013-05-14 19:28:31.647224186 +0200
@@ -4970,14 +4970,18 @@
 
 // is_headless_jre()
 //
-// Test for the existence of libmawt in motif21 or xawt directories
+// Test for the existence of xawt/libmawt.so or libawt_xawt.so
 // in order to report if we are running in a headless jre
+//
+// Since JDK8 xawt/libmawt.so was moved into the same directory
+// as libawt.so, and renamed libawt_xawt.so
+//
 bool os::is_headless_jre() {
   struct stat statbuf;
   char buf[MAXPATHLEN];
   char libmawtpath[MAXPATHLEN];
   const char *xawtstr  = "/xawt/libmawt.so";
-  const char *motifstr = "/motif21/libmawt.so";
+  const char *new_xawtstr = "/libawt_xawt.so";
   char *p;
 
   // Get path to libjvm.so
@@ -4998,9 +5002,9 @@
   strcat(libmawtpath, xawtstr);
   if (::stat(libmawtpath, &statbuf) == 0) return false;
 
-  // check motif21/libmawt.so
+  // check libawt_xawt.so
   strcpy(libmawtpath, buf);
-  strcat(libmawtpath, motifstr);
+  strcat(libmawtpath, new_xawtstr);
   if (::stat(libmawtpath, &statbuf) == 0) return false;
 
   return true;