diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index 3e137aa..a4a85cb 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -1,3 +1,5 @@
+2008-12-04 P. A. Bagyenda <bagyenda@dsmagic.com>
+	* Minor patches for better Solaris compatibility (Thanks to Benno Rice <benno@ekit-inc.com>)
 2008-12-01 P. A. Bagyenda <bagyenda@dsmagic.com>
 	* Misc. fixes to number normalisation in mmsbox
 2008-11-26 P. A. Bagyenda <bagyenda@dsmagic.com>
diff --git a/mbuni/mmlib/mms_queue.c b/mbuni/mmlib/mms_queue.c
index ed8e049..d2cbbae 100644
--- a/mbuni/mmlib/mms_queue.c
+++ b/mbuni/mmlib/mms_queue.c
@@ -203,7 +203,7 @@ static MmsEnvelope *mms_queue_readenvelope(char *qf, char *mms_queuedir, int sho
      
      strncpy(xqf, octstr_get_cstr(fname), sizeof xqf);
      
-     if ((fd = open(octstr_get_cstr(fname), O_RDONLY)) < 0) {
+     if ((fd = open(octstr_get_cstr(fname), O_RDWR)) < 0) {
 	  octstr_destroy(fname);
 	  return NULL;
      } else if (mm_lockfile(fd, octstr_get_cstr(fname), shouldblock) != 0) {
diff --git a/mbuni/mmsc/mms_billing_shell.c b/mbuni/mmsc/mms_billing_shell.c
index 5827aca..d14597d 100644
--- a/mbuni/mmsc/mms_billing_shell.c
+++ b/mbuni/mmsc/mms_billing_shell.c
@@ -13,6 +13,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#ifdef SunOS
+#include <sys/wait.h>
+#endif
+
 #include "mms_billing.h"
 
 static Octstr *script = NULL;