diff --git a/ChangeLog b/ChangeLog
index d496c9ae1..abe42deaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-15  Tomas Frydrych  <tf@openedhand.com>
+
+	* configure.ac:
+	* clutter/clutter-version.h.in:
+	* build/msvc_2k5/clutter-version.h:
+	Removed unused --without-fpu configure option and CLUTTER_NO_FPU
+	macro
+
 2008-02-15  Tomas Frydrych  <tf@openedhand.com>
 
 	* build/mingw/README:
diff --git a/build/msvc_2k5/clutter-version.h b/build/msvc_2k5/clutter-version.h
index 930ae5adf..6e7b69c44 100644
--- a/build/msvc_2k5/clutter-version.h
+++ b/build/msvc_2k5/clutter-version.h
@@ -6,14 +6,13 @@
  *     the clutter root !!!
  */
 #define CLUTTER_MAJOR_VERSION   0
-#define CLUTTER_MINOR_VERSION   5
+#define CLUTTER_MINOR_VERSION   6
 #define CLUTTER_MICRO_VERSION   0
-#define CLUTTER_VERSION         0.5.0
-#define CLUTTER_VERSION_S       "0.5.0"
+#define CLUTTER_VERSION         0.6.0
+#define CLUTTER_VERSION_S       "0.6.0"
 
 #define CLUTTER_FLAVOUR         "sdl"
 #define CLUTTER_COGL            "gl"
-#define CLUTTER_NO_FPU          0
 
 /* The rest needs no modificactions */
 
diff --git a/clutter/clutter-version.h.in b/clutter/clutter-version.h.in
index 0e3370013..806febca4 100644
--- a/clutter/clutter-version.h.in
+++ b/clutter/clutter-version.h.in
@@ -117,8 +117,9 @@
  *
  * Set to 1 if Clutter was built without FPU (i.e fixed math), 0 otherwise
  *
- * Since: 0.4
+ * @Deprecated: 0.6: This macro is no longer defined (identical code is used
+ *  regardless the presence of FPU).
  */
-#define CLUTTER_NO_FPU          (@CLUTTER_NO_FPU@)
+#define CLUTTER_NO_FPU          CLUTTER_NO_FPU_MACRO_WAS_REMOVED
 
 #endif /* __CLUTTER_VERSION_H__ */
diff --git a/configure.ac b/configure.ac
index acb5c1ebf..64261d0c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,19 +79,6 @@ AC_CHECK_FUNCS([memset munmap strcasecmp strdup])
 
 dnl ========================================================================
 
-CLUTTER_NO_FPU="0"
-AC_ARG_WITH(fpu,
-            AS_HELP_STRING([--without-fpu],
-                           [Assume target hardware has no fpu]),
-            [with_fpu=$withval],
-            [with_fpu=yes])
-
-if test "x$with_fpu" != "xyes" ; then
-   CLUTTER_NO_FPU="1"
-fi
-
-AC_SUBST(CLUTTER_NO_FPU)
-
 backendextra=
 backendextralib=
 clutterbackend=glx
@@ -443,5 +430,4 @@ echo "      Fast FP conversions:   ${enable_fast_fp_conversions}"
 echo "           Compiler flags:   ${CPPFLAGS}"
 echo "        API Documentation:   ${enable_gtk_doc}"
 echo "     Manual Documentation:   ${enable_manual}"
-echo "              FPU Support:   ${with_fpu}"
 echo ""