diff -Nurd jogl.old/make/build.xml jogl/make/build.xml
--- jogl.old/make/build.xml	2005-05-13 16:35:36.000000000 -0400
+++ jogl/make/build.xml	2008-10-23 12:11:50.000000000 -0400
@@ -73,7 +73,7 @@
         <!-- Load the user specified properties file that defines various host
            - specific paths.  The user will be notified if this is does not
            - exist. -->
-        <property name="user.properties.file" value="${user.home}/jogl.properties" />
+        <property name="user.properties.file" value="jogl.properties" />
         <property file="${user.properties.file}" />
 
         <echo message="Loaded ${user.properties.file}." />
@@ -83,7 +83,7 @@
         <!-- Load the user specified properties file that defines various host
            - specific paths.  The user will be notified if this is does not
            - exist. -->
-        <property name="user.properties.file" value="${user.home}/jogl.properties" />
+        <property name="user.properties.file" value="jogl.properties" />
         <property file="${user.properties.file}" />
 
         <echo message="Loaded ${user.properties.file}." />
@@ -802,7 +802,7 @@
 
       <condition property="c.compiler.use-debug"><istrue value="${c.compiler.debug}"/></condition>
 
-      <cc outtype="shared" 
+      <cc outtype="plugin" 
           objdir="${obj.jogl}" 
           outfile="${obj}/${output.lib.name}"
           optimize="${c.compiler.optimise}" 
@@ -843,14 +843,14 @@
 
     <target name="c.rename.jogl.lib.macosx" if="os.isMacOSX">
       <!-- FIXME: this is a hack; the cpptask should have an option to change the
-           suffix or at least understand the override from dylib to jnilib -->
-      <move file="${obj}/libjogl.dylib" tofile="${obj}/libjogl.jnilib" />
+           suffix or at least understand the override from bundle to jnilib -->
+      <move file="${obj}/libjogl.bundle" tofile="${obj}/libjogl.jnilib" />
     </target>
 
     <target name="c.rename.jogl_cg.lib.macosx" if="os.isMacOSX">
       <!-- FIXME: this is a hack; the cpptask should have an option to change the
-           suffix or at least understand the override from dylib to jnilib -->
-      <move file="${obj}/libjogl_cg.dylib" tofile="${obj}/libjogl_cg.jnilib" />
+           suffix or at least understand the override from bundle to jnilib -->
+      <move file="${obj}/libjogl_cg.bundle" tofile="${obj}/libjogl_cg.jnilib" />
     </target>
 
     <target name="c.build.jogl">
diff -Nurd jogl.old/make/jogl.properties jogl/make/jogl.properties
--- jogl.old/make/jogl.properties	2005-06-15 18:46:40.000000000 -0400
+++ jogl/make/jogl.properties	2008-10-23 12:11:50.000000000 -0400
@@ -20,7 +20,7 @@
 # Linux
 # antlr.jar=/home/kbr/antlr-2.7.2/antlr.jar
 # Mac OS X
-# antlr.jar=/Users/kbr/antlr-2.7.2/antlr.jar
+antlr.jar=@PREFIX@/share/java/antlr/antlr.jar
 # Solaris
 # antlr.jar=/export/kbr/ANTLR/antlr-2.7.2/antlr.jar
 
diff -Nurd jogl.old/src/net/java/games/gluegen/StructLayout.java jogl/src/net/java/games/gluegen/StructLayout.java
--- jogl.old/src/net/java/games/gluegen/StructLayout.java	2005-05-27 14:24:16.000000000 -0400
+++ jogl/src/net/java/games/gluegen/StructLayout.java	2008-10-23 12:12:04.000000000 -0400
@@ -128,6 +128,8 @@
         (os.startsWith("sunos") && cpu.equals("sparc")) ||
         (os.startsWith("sunos") && cpu.equals("x86")) ||
         (os.startsWith("mac os") && cpu.equals("ppc")) ||
+        (os.startsWith("mac os") && cpu.equals("i386")) ||
+        (os.startsWith("mac os") && cpu.equals("x86_64")) ||
         (os.startsWith("freebsd") && cpu.equals("i386"))
 	) {
       // FIXME: make struct alignment configurable? May need to change