diff --git a/dlls/kernel/time.c b/dlls/kernel/time.c
index 607f70a621e..85a7a3a2fcb 100644
--- a/dlls/kernel/time.c
+++ b/dlls/kernel/time.c
@@ -353,12 +353,11 @@ BOOL WINAPI SetLocalTime(
  * BUGS
  *
  *  Only the special case of disabled time adjustments is supported.
- *  (also the signature is wrong it should have a return type of BOOL)
  */
-DWORD WINAPI GetSystemTimeAdjustment(
-    LPDWORD lpTimeAdjustment,         /* [out] The clock adjustment per interupt in 100's of nanoseconds. */
-    LPDWORD lpTimeIncrement,          /* [out] The time between clock interupts in 100's of nanoseconds. */
-    LPBOOL  lpTimeAdjustmentDisabled) /* [out] The clock synchonisation has been disabled. */
+BOOL WINAPI GetSystemTimeAdjustment(
+    PDWORD lpTimeAdjustment,         /* [out] The clock adjustment per interupt in 100's of nanoseconds. */
+    PDWORD lpTimeIncrement,          /* [out] The time between clock interupts in 100's of nanoseconds. */
+    PBOOL  lpTimeAdjustmentDisabled) /* [out] The clock synchonisation has been disabled. */
 {
     *lpTimeAdjustment = 0;
     *lpTimeIncrement = 0;
diff --git a/files/dos_fs.c b/files/dos_fs.c
index 058e1c4a7cf..7947b35cf65 100644
--- a/files/dos_fs.c
+++ b/files/dos_fs.c
@@ -2126,6 +2126,10 @@ INT WINAPI MulDiv(
 BOOL WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, LPFILETIME ft)
 {
     struct tm newtm;
+#ifndef HAVE_TIMEGM
+    struct tm *gtm;
+    time_t time1, time2;
+#endif
 
     newtm.tm_sec  = (fattime & 0x1f) * 2;
     newtm.tm_min  = (fattime >> 5) & 0x3f;
@@ -2133,7 +2137,14 @@ BOOL WINAPI DosDateTimeToFileTime( WORD fatdate, WORD fattime, LPFILETIME ft)
     newtm.tm_mday = (fatdate & 0x1f);
     newtm.tm_mon  = ((fatdate >> 5) & 0x0f) - 1;
     newtm.tm_year = (fatdate >> 9) + 80;
-    RtlSecondsSince1970ToTime( mktime( &newtm ), ft );
+#ifdef HAVE_TIMEGM
+    RtlSecondsSince1970ToTime( timegm(&newtm), ft );
+#else
+    time1 = mktime(&newtm);
+    gtm = gmtime(&time1);
+    time2 = mktime(gtm);
+    RtlSecondsSince1970ToTime( 2*time1-time2, ft );
+#endif
     return TRUE;
 }
 
@@ -2145,7 +2156,7 @@ BOOL WINAPI FileTimeToDosDateTime( const FILETIME *ft, LPWORD fatdate,
                                      LPWORD fattime )
 {
     time_t unixtime = DOSFS_FileTimeToUnixTime( ft, NULL );
-    struct tm *tm = localtime( &unixtime );
+    struct tm *tm = gmtime( &unixtime );
     if (fattime)
         *fattime = (tm->tm_hour << 11) + (tm->tm_min << 5) + (tm->tm_sec / 2);
     if (fatdate)
@@ -2163,11 +2174,14 @@ BOOL WINAPI LocalFileTimeToFileTime( const FILETIME *localft,
 {
     struct tm *xtm;
     DWORD remainder;
+    time_t utctime;
 
-    /* convert from local to UTC. Perhaps not correct. FIXME */
-    time_t unixtime = DOSFS_FileTimeToUnixTime( localft, &remainder );
-    xtm = gmtime( &unixtime );
-    DOSFS_UnixTimeToFileTime( mktime(xtm), utcft, remainder );
+    /* Converts from local to UTC. */
+    time_t localtime = DOSFS_FileTimeToUnixTime( localft, &remainder );
+    xtm = gmtime( &localtime );
+    utctime = mktime(xtm);
+    if(xtm->tm_isdst > 0) utctime-=3600;
+    DOSFS_UnixTimeToFileTime( utctime, utcft, remainder );
     return TRUE; 
 }
 
@@ -2179,7 +2193,7 @@ BOOL WINAPI FileTimeToLocalFileTime( const FILETIME *utcft,
                                        LPFILETIME localft )
 {
     DWORD remainder;
-    /* convert from UTC to local. Perhaps not correct. FIXME */
+    /* Converts from UTC to local. */
     time_t unixtime = DOSFS_FileTimeToUnixTime( utcft, &remainder );
 #ifdef HAVE_TIMEGM
     struct tm *xtm = localtime( &unixtime );
@@ -2189,14 +2203,13 @@ BOOL WINAPI FileTimeToLocalFileTime( const FILETIME *utcft,
     DOSFS_UnixTimeToFileTime( localtime, localft, remainder );
 
 #else
-    struct tm *xtm,*gtm;
-    time_t time1,time2;
+    struct tm *xtm;
+    time_t time;
 
-    xtm = localtime( &unixtime );
-    gtm = gmtime( &unixtime );
-    time1 = mktime(xtm);
-    time2 = mktime(gtm);
-    DOSFS_UnixTimeToFileTime( 2*time1-time2, localft, remainder );
+    xtm = gmtime( &unixtime );
+    time = mktime(xtm);
+    if(xtm->tm_isdst > 0) time-=3600;
+    DOSFS_UnixTimeToFileTime( 2*unixtime-time, localft, remainder );
 #endif
     return TRUE; 
 }
@@ -2291,7 +2304,7 @@ BOOL WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft )
     struct tm xtm;
     time_t utctime;
 #else
-    struct tm xtm,*local_tm,*utc_tm;
+    struct tm xtm,*utc_tm;
     time_t localtim,utctime;
 #endif
 
@@ -2309,7 +2322,6 @@ BOOL WINAPI SystemTimeToFileTime( const SYSTEMTIME *syst, LPFILETIME ft )
 			      syst->wMilliseconds * 10000 );
 #else
     localtim = mktime(&xtm);    /* now we've got local time */
-    local_tm = localtime(&localtim);
     utc_tm = gmtime(&localtim);
     utctime = mktime(utc_tm);
     DOSFS_UnixTimeToFileTime( 2*localtim -utctime, ft, 
diff --git a/include/winbase.h b/include/winbase.h
index 769bab02006..19447c31f7d 100644
--- a/include/winbase.h
+++ b/include/winbase.h
@@ -1326,6 +1326,7 @@ HANDLE      WINAPI GetStdHandle(DWORD);
 VOID        WINAPI GetSystemInfo(LPSYSTEM_INFO);
 BOOL        WINAPI GetSystemPowerStatus(LPSYSTEM_POWER_STATUS);
 VOID        WINAPI GetSystemTime(LPSYSTEMTIME);
+BOOL        WINAPI GetSystemTimeAdjustment(PDWORD,PDWORD,PBOOL);
 VOID        WINAPI GetSystemTimeAsFileTime(LPFILETIME);
 DWORD       WINAPI GetTapeParameters(HANDLE,DWORD,LPDWORD,LPVOID);
 DWORD       WINAPI GetTapePosition(HANDLE,DWORD,LPDWORD,LPDWORD,LPDWORD);