diff --git a/ChangeLog b/ChangeLog
index ec31eec63..e8002b40a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -262,6 +262,8 @@
    Jennifer Cormier).
  + Fixed bug #936, which caused tests to fail on Solaris (thanks to Owen Clarke).
  + Fixed bug #937, which failed 'stat' calls on Solaris (thanks to Owen Clarke).
+ + Fixed bug #938, which corrected compiler warnings on Solaris (thanks to Owen
+   Clarke).
 
 # Untracked Bugs, biggest first.
  + Fixed bug that required the '%YAML' prologue in a YAML import.
diff --git a/src/Timer.cpp b/src/Timer.cpp
index 6564c3777..3c99b75c6 100644
--- a/src/Timer.cpp
+++ b/src/Timer.cpp
@@ -93,7 +93,7 @@ void Timer::stop ()
     struct timeval end;
     gettimeofday (&end, NULL);
     _running = false;
-    _total += (end.tv_sec - _start.tv_sec) * 1000000.0
+    _total += (end.tv_sec - _start.tv_sec) * 1000000
             + (end.tv_usec - _start.tv_usec);
   }
 }