diff --git a/ChangeLog b/ChangeLog
index 82960817f0..c19eff045c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2007-01-29  Edward Hervey  <edward@fluendo.com>
+
+	* configure.ac:
+	Check for availability of video-orientation interface
+	* gst/gst.override:
+	don't forget to increment the refcount of Py_None before returning it.
+	* gst/interfaces.override:
+	If video-orientation interface isn't available, don't include the
+	header.
+
+2007-01-26  Edward Hervey  <edward@fluendo.com>
+
+	* configure.ac:
+	0.10.6.1 pre-release
+	
 2007-01-26  Edward Hervey  <edward@fluendo.com>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 926bb3cc39..219f73968d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
 dnl initialize autoconf
 dnl when going to/from release please set the nano (fourth number) right !
 dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(GStreamer Python Bindings, 0.10.6.1,
+AC_INIT(GStreamer Python Bindings, 0.10.6.2,
     http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
     gst-python)
 
@@ -154,6 +154,7 @@ then
     IGNORE_GST_PB_0_10_11="gst-pb-0.10.11.ignore"
   else
     IGNORE_GST_PB_0_10_11=""
+    AC_DEFINE_UNQUOTED(HAVE_VIDEO_ORIENTATION_INTERFACE, 1, [We can use the videoorientation interface])
   fi
 
 
@@ -167,6 +168,7 @@ else
   IGNORE_GST_0_10_11=""
   IGNORE_GST_0_10_12=""
   IGNORE_GST_PB_0_10_11=""
+  AC_DEFINE_UNQUOTED(HAVE_VIDEO_ORIENTATION_INTERFACE, 1, [We can use the videoorientation interface])
 fi
 AC_SUBST(IGNORE_GST_0_10_3)
 AC_SUBST(IGNORE_GST_0_10_4)
@@ -177,6 +179,7 @@ AC_SUBST(IGNORE_GST_0_10_10)
 AC_SUBST(IGNORE_GST_0_10_11)
 AC_SUBST(IGNORE_GST_0_10_12)
 AC_SUBST(IGNORE_GST_PB_0_10_11)
+AC_SUBST(HAVE_VIDEO_ORIENTATION)
 
 dnl check for gstreamer-base; uninstalled is selected preferentially
 PKG_CHECK_MODULES(GST_BASE, gstreamer-base-$GST_MAJORMINOR >= $GST_REQ,
diff --git a/gst/gst.override b/gst/gst.override
index caeb1cf0e7..c5b265f288 100644
--- a/gst/gst.override
+++ b/gst/gst.override
@@ -225,8 +225,8 @@ pygst_debug_log (PyObject *pyobject, PyObject *string, GstDebugLevel level,
     gst_debug_log (python_debug, level, filename, function, lineno, object, "%s", str);
     if (filename)
 	g_free(filename);
-    Py_INCREF (Py_None);
 #endif
+    Py_INCREF (Py_None);
     return Py_None;    
 }
 
diff --git a/gst/interfaces.override b/gst/interfaces.override
index 7775d1ecf8..f6c8197f66 100644
--- a/gst/interfaces.override
+++ b/gst/interfaces.override
@@ -34,7 +34,9 @@ headers
 #include <gst/interfaces/propertyprobe.h>
 #include <gst/interfaces/tuner.h>
 #include <gst/interfaces/mixer.h>
+#ifdef HAVE_VIDEO_ORIENTATION_INTERFACE
 #include <gst/interfaces/videoorientation.h>
+#endif
 
 %%
 modulename gst.interfaces