diff --git a/src/modules/timer/sdl/Timer.cpp b/src/modules/timer/sdl/Timer.cpp
index dc0028982..07ebf30dc 100644
--- a/src/modules/timer/sdl/Timer.cpp
+++ b/src/modules/timer/sdl/Timer.cpp
@@ -93,19 +93,12 @@ namespace sdl
 	float Timer::getMicroTime() const
 	{
 		#ifdef LOVE_WINDOWS
-			FILETIME tstruct;
-			unsigned __int64 t = 0;
-			GetSystemTimeAsFileTime(&tstruct);	//ah, yes, a struct with a high and a low part
-			t = tstruct.dwHighDateTime;			//let's make it one variable;
-			t <<= 32;
-			t |= tstruct.dwLowDateTime;
-			#if defined(_MSC_VER) || defined(_MSC_EXTENSIONS)
-				float floatt = (t/10-11644473600000000Ui64)/1000000.0f;
-			#else
-				float floatt = (t/11644473600000000ULL)/1000000.0f;
-			#endif	//even windows has it's differences, yay...
-			floatt %= 86400; //from start of day, else it's too big for a lua_Number
-			return floatt;
+			long ticks, freq;
+			QueryPeformanceCounter(&ticks);
+			QueryPeformanceFrequency(&freq);
+			long secs = ticks/freq;
+			long usecs = (ticks%freq)/(freq/1000000.0f);
+			return secs%86400 + usecs/1000000.0f;
 		#else
 			timeval t;
 			gettimeofday(&t, NULL);
diff --git a/src/modules/timer/sdl/Timer.h b/src/modules/timer/sdl/Timer.h
index a37fcca74..4a1b3833a 100644
--- a/src/modules/timer/sdl/Timer.h
+++ b/src/modules/timer/sdl/Timer.h
@@ -119,9 +119,9 @@ namespace sdl
 		float getTime() const;
 
 		/**
-		 * Gets the amount of time since the Epoch. Useful for timing too because
-		 * it is accurate to the microsecond.
-		 * @return The time (in seconds) since the Epoch.
+		 * Gets the amount of time passed since an unspecified time. The time is accurate
+		 * to the microsecond, and is limited to 24 hours.
+		 * @return The time (in seconds)
 		 **/
 		float getMicroTime() const;