diff --git a/source_code/GNUmakefile.os4 b/source_code/GNUmakefile.os4
index 69646cd..471e150 100644
--- a/source_code/GNUmakefile.os4
+++ b/source_code/GNUmakefile.os4
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.4 2009-04-14 11:32:51 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.5 2009-04-14 12:16:11 obarthel Exp $
 #
 # :ts=8
 #
@@ -47,7 +47,7 @@ DEBUG = -ggdb
 
 ###########################################################################
 
-CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(CPU) $(OPTIONS) \
+CFLAGS = -mcrt=clib2 -D__NO_NET_API $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(CPU) $(OPTIONS) \
          -I. -I/V/include -I/usr/local/amiga/ppc-amigaos/sys-include -Iinclude -Inetinclude
 LFLAGS = -nostartfiles -nostdlib -L.
 
diff --git a/source_code/main.c b/source_code/main.c
index 32132de..4f91c1f 100644
--- a/source_code/main.c
+++ b/source_code/main.c
@@ -1,5 +1,5 @@
 /*
- * $Id: main.c,v 1.8 2009-04-14 11:32:51 obarthel Exp $
+ * $Id: main.c,v 1.9 2009-04-14 12:16:11 obarthel Exp $
  *
  * :ts=4
  *
@@ -40,6 +40,29 @@
 
 /****************************************************************************/
 
+/* A quick workaround for the timeval/timerequest->TimeVal/TimeRequest
+   change in the recent OS4 header files. */
+#if defined(__NEW_TIMEVAL_DEFINITION_USED__)
+
+#define timeval		TimeVal
+#define tv_secs		Seconds
+#define tv_micro	Microseconds
+
+#define timerequest	TimeRequest
+#define tr_node		Request
+#define tr_time		Time
+
+#endif /* __NEW_TIMEVAL_DEFINITION_USED__ */
+
+/****************************************************************************/
+
+/* This is for backwards compatibility only. */
+#if defined(__amigaos4__)
+#define fib_EntryType fib_Obsolete
+#endif /* __amigaos4__ */
+
+/****************************************************************************/
+
 #include "smbfs_rev.h"
 STRPTR Version = VERSTAG;