--- a/src/share/classes/com/sun/tools/javah/Util.java	Wed Aug 20 10:18:47 2008 -0700
+++ b/src/share/classes/com/sun/tools/javah/Util.java	Wed Aug 20 10:30:30 2008 -0700
@@ -180,6 +180,14 @@ public class Util {
             os = "win32";
         } else if (os.indexOf("Linux") >= 0) {
             os = "Linux";
+	} else if (os.indexOf("FreeBSD") >= 0) {
+	    os = "FreeBSD";
+	} else if (os.indexOf("Darwin") >= 0) {
+	    os = "Darwin";
+	} else if (os.indexOf("NetBSD") >= 0) {
+	    os = "NetBSD";
+	} else if (os.indexOf("OpenBSD") >= 0) {
+	    os = "OpenBSD";
         }
         String arch = System.getProperty("os.arch");
         String resname = "com.sun.tools.javah.resources." + os + "_" + arch;