diff --git a/demos/Posix-GCC/Makefile b/demos/Posix-GCC/Makefile
index 55fa40fb7..5e2b4d4f8 100644
--- a/demos/Posix-GCC/Makefile
+++ b/demos/Posix-GCC/Makefile
@@ -107,16 +107,20 @@ ASFLAGS = -Wa,-amhls=$(<:.s=.lst) $(ADEFS)
 CPFLAGS = $(OPT) -Wall -Wextra -Wstrict-prototypes -fverbose-asm $(DEFS)
 
 ifeq ($(HOST_OSX),yes)
-	OSX_SDK = /Developer/SDKs/MacOSX10.5.sdk
-	OSX_ARCH = -mmacosx-version-min=10.3 -arch i386
-	
-	CPFLAGS += -isysroot $(OSX_SDK) $(OSX_ARCH)
-	LDFLAGS = -Wl -Map=$(PROJECT).map,-syslibroot,$(OSX_SDK),$(LIBDIR)
-	LIBS += $(OSX_ARCH)
+  ifeq ($(OSX_SDK),)
+    OSX_SDK = /Developer/SDKs/MacOSX10.7.sdk
+  endif
+  ifeq ($(OSX_ARCH),)
+    OSX_ARCH = -mmacosx-version-min=10.3 -arch i386
+  endif
+
+  CPFLAGS += -isysroot $(OSX_SDK) $(OSX_ARCH)
+  LDFLAGS = -Wl -Map=$(PROJECT).map,-syslibroot,$(OSX_SDK),$(LIBDIR)
+  LIBS += $(OSX_ARCH)
 else
-	# Linux, or other
-	CPFLAGS += -Wa,-alms=$(<:.c=.lst)
-	LDFLAGS += -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR)
+  # Linux, or other
+  CPFLAGS += -Wa,-alms=$(<:.c=.lst)
+  LDFLAGS += -Wl,-Map=$(PROJECT).map,--cref,--no-warn-mismatch $(LIBDIR)
 endif
 
 # Generate dependency information
diff --git a/docs/Doxyfile_chm b/docs/Doxyfile_chm
index c1333cd33..e51860562 100644
--- a/docs/Doxyfile_chm
+++ b/docs/Doxyfile_chm
@@ -31,7 +31,7 @@ PROJECT_NAME           = ChibiOS/RT
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.3.5
+PROJECT_NUMBER         = 2.4.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
diff --git a/docs/Doxyfile_html b/docs/Doxyfile_html
index bbf7156a0..7e1bd6292 100644
--- a/docs/Doxyfile_html
+++ b/docs/Doxyfile_html
@@ -31,7 +31,7 @@ PROJECT_NAME           = ChibiOS/RT
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.3.5
+PROJECT_NUMBER         = 2.4.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 14fefa558..0e9708682 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -40,7 +40,7 @@
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "2.3.5unstable"
+#define CH_KERNEL_VERSION       "2.4.0"
 
 /**
  * @name    Kernel version
@@ -54,12 +54,12 @@
 /**
  * @brief   Kernel version minor number.
  */
-#define CH_KERNEL_MINOR         3
+#define CH_KERNEL_MINOR         4
 
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         5
+#define CH_KERNEL_PATCH         0
 /** @} */
 
 /*
diff --git a/todo.txt b/todo.txt
index 8079a4cbc..53569ec32 100644
--- a/todo.txt
+++ b/todo.txt
@@ -6,8 +6,6 @@ X = In progress, some work done.
 N = Decided against.
 
 Current Pipeline (2.4.0):
-X Revision of the RTCv1 driver implementation.
-- Posix simulator tickets and test.
 - Complete test cycle.
 - Complete documentation cycle.