diff --git a/ChangeLog b/ChangeLog
index ecf7894e3e..ce2fb3ce5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-12-04  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	patch by: Sebastien Moutte
+
+	* libs/gst/controller/gstinterpolation.c:
+	  use convert function for uint64/double
+	* win32/vs6/libgstcontroller.dsp:
+	  link to GLib
+
 2005-12-04  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* gst/gstutils.c: (gst_util_guint64_to_gdouble),
diff --git a/libs/gst/controller/gstinterpolation.c b/libs/gst/controller/gstinterpolation.c
index a0398593fb..08b79fde39 100644
--- a/libs/gst/controller/gstinterpolation.c
+++ b/libs/gst/controller/gstinterpolation.c
@@ -225,7 +225,7 @@ _interpolate_linear_get_##type (GstControlledProperty * prop, GstClockTime times
       value2 = g_value_get_##type (&tv2->value); \
       valuediff = (gdouble) (value2 - value1); \
       \
-      return ((g##type) (value1 + valuediff * ((timestamp - tv1->timestamp) / timediff))); \
+      return ((g##type) (value1 + valuediff * (gst_guint64_to_gdouble (timestamp - tv1->timestamp) / timediff))); \
     } \
     else { \
       return (g_value_get_##type (&tv1->value)); \
diff --git a/win32/vs6/libgstcontroller.dsp b/win32/vs6/libgstcontroller.dsp
index dc11c17c4b..c34ab241fd 100644
--- a/win32/vs6/libgstcontroller.dsp
+++ b/win32/vs6/libgstcontroller.dsp
@@ -52,7 +52,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
+# ADD LINK32 glib-2.0.lib gobject-2.0.lib gthread-2.0.lib gmodule-2.0.lib /nologo /dll /machine:I386
 
 !ELSEIF  "$(CFG)" == "libgstcontroller - Win32 Debug"
 
@@ -77,7 +77,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 glib-2.0D.lib gobject-2.0D.lib gthread-2.0D.lib gmodule-2.0D.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
 
 !ENDIF