diff --git a/ChangeLog b/ChangeLog
index fe7097277..2215610c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-07-05  Paolo Nenzi <p.nenzi@ieee.org>
+
+	*   src/frontend/resource.c: added __APPLE__ for mac osx support as in
+	    patch sent by Khairulmizam Samsudin <kmbs@hotmail.com>
+	
+	*   src/spicelib/parser/inpdomod.c: fixed some typos as in patch
+	    sent by Khairulmizam Samsudin <kmbs@hotmail.com>
+	    
 2004-06-22  Paolo Nenzi <p.nenzi@ieee.org>
 
 	*   src/spicelib/devices/vbic: Vbic code updated. Thanks to Dietmar 
diff --git a/src/frontend/resource.c b/src/frontend/resource.c
index 3a2a949a6..11149c07e 100644
--- a/src/frontend/resource.c
+++ b/src/frontend/resource.c
@@ -406,7 +406,7 @@ baseaddr(void)
 	if (getenv("SPICE_NO_DATASEG_CHECK"))
 		return 0;
 
-#if defined(__CYGWIN__) || defined(HAS_WINDOWS)
+#if defined(__CYGWIN__) || defined(HAS_WINDOWS) || defined(__APPLE__)
 	return 0;
 #endif
 
diff --git a/src/spicelib/parser/inpdomod.c b/src/spicelib/parser/inpdomod.c
index 49fdd73ea..c130b46cc 100644
--- a/src/spicelib/parser/inpdomod.c
+++ b/src/spicelib/parser/inpdomod.c
@@ -135,14 +135,14 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
         		type = INPtypelook("MESA");
         		if (type < 0)
         		{
-        			err = INPmkTemp("Device type MES2 not availabe\n");
+        			err = INPmkTemp("Device type MESA not availabe\n");
         		}
         		break;
 			case 3:
         		type = INPtypelook("MESA");
         		if (type < 0)
         		{
-        			err = INPmkTemp("Device type MES2 not availabe\n");
+        			err = INPmkTemp("Device type MESA not availabe\n");
         		}
         		break;
         	case 4:
@@ -168,7 +168,7 @@ char *INPdomodel(void *ckt, card * image, INPtables * tab)
         		break;
 
         	default:
-        		err = INPmkTemp("only mesfet device level 1  and hfet level 5-6 supported\n");
+        		err = INPmkTemp("only mesfet device level 1-4 and hfet level 5-6 supported\n");
         		break;
         }
 	INPmakeMod(modname, type, image);