diff --git a/Makefile b/Makefile
index 731330fd8b..9f298c38cf 100644
--- a/Makefile
+++ b/Makefile
@@ -332,7 +332,7 @@ ifdef OSX
 BASECFLAGS += -O3 -funroll-loops -fsched-interblock -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-jumps-max-skip=15 -falign-loops-max-skip=15 -mdynamic-no-pic -mpowerpc-gpopt -force_cpusubtype_ALL
 else
 ifdef MORPHOS
-BASECFLAGS += -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations
+BASECFLAGS += -I/gg/os-include -O2 -noixemul -fstrict-aliasing -fexpensive-optimizations
 BASECFLAGS += -mcpu=604 -fno-inline -mstring -mmultiple
 else
 BASECFLAGS += -O2
@@ -1002,15 +1002,15 @@ endif
 
 .deps/%.d: %.c $(MAKE_CONFIG) table/strings.h endian_target.h
 	@echo '===> Determining dependencies of $<'
-	$(Q)$(CC) $(CFLAGS) $(CDEFS) -M $< > $@
+	$(Q)$(CC) $(CFLAGS) $(CDEFS) -MM $< > $@
 
 .deps/%.d: %.cpp $(MAKE_CONFIG) table/strings.h endian_target.h
 	@echo '===> Determining dependencies of $<'
-	$(Q)$(CXX) $(CFLAGS) $(CDEFS) -M $< > $@
+	$(Q)$(CXX) $(CFLAGS) $(CDEFS) -MM $< > $@
 
 .deps/%.d: %.m $(MAKE_CONFIG) table/strings.h endian_target.h
 	@echo '===> Determining dependencies of $<'
-	$(Q)$(CC) $(CFLAGS) $(CDEFS) -M $< > $@
+	$(Q)$(CC) $(CFLAGS) $(CDEFS) -MM $< > $@
 
 
 %.o: %.c $(MAKE_CONFIG)
diff --git a/os/morphos/icons/OpenTTD.info b/os/morphos/icons/OpenTTD.info
old mode 100755
new mode 100644
index fd6cafa49a..3a25be6830
Binary files a/os/morphos/icons/OpenTTD.info and b/os/morphos/icons/OpenTTD.info differ
diff --git a/os/morphos/icons/docs.info b/os/morphos/icons/docs.info
old mode 100755
new mode 100644
diff --git a/os/morphos/icons/drawer.info b/os/morphos/icons/drawer.info
old mode 100755
new mode 100644
diff --git a/unix.c b/unix.c
index ee478fbccd..16c79988d7 100644
--- a/unix.c
+++ b/unix.c
@@ -31,6 +31,10 @@
 #ifdef __MORPHOS__
 #include <exec/types.h>
 ULONG __stack = (1024*1024)*2; // maybe not that much is needed actually ;)
+
+// The system supplied definition of SIG_IGN does not match
+#undef SIG_IGN
+#define SIG_IGN (void (*)(int))1
 #endif /* __MORPHOS__ */
 
 #ifdef __AMIGA__