diff --git a/mozilla/modules/libreg/src/Makefile.in b/mozilla/modules/libreg/src/Makefile.in
index f6176d68881..1242ccef66a 100644
--- a/mozilla/modules/libreg/src/Makefile.in
+++ b/mozilla/modules/libreg/src/Makefile.in
@@ -36,8 +36,8 @@ MKSHLIB :=
 
 include $(topsrcdir)/config/config.mk
 
-# Memory mapped files are not supported under QNX and Neutrino
-ifneq ($(OS_ARCH),QNX)
+# Memory mapped files are not supported under QNX, Neutrino and BeOS
+ifeq (,$(filter BeOS QNX,$(OS_ARCH)))
 DEFINES += -DUSE_MMAP_REGISTRY_IO
 CSRCS += mmapio.c
 endif
diff --git a/mozilla/modules/libreg/src/reg.c b/mozilla/modules/libreg/src/reg.c
index 09ac23f2f7f..e29cba57c61 100644
--- a/mozilla/modules/libreg/src/reg.c
+++ b/mozilla/modules/libreg/src/reg.c
@@ -310,7 +310,7 @@ static REGFILE* vr_findRegFile(char *filename)
 
     pReg = RegList;
     while( pReg != NULL ) {
-#ifdef XP_UNIX
+#if defined XP_UNIX || defined XP_BEOS
         if ( 0 == XP_STRCMP( filename, pReg->filename ) ) {
 #else
         if ( 0 == XP_STRCASECMP( filename, pReg->filename ) ) {