diff --git a/src/starsphere/StarsphereRadio.cpp b/src/starsphere/StarsphereRadio.cpp
index e7894c8271743bf222bfee58f51eaee4afc5b5e6..62a61243b1c23c6a7b088fab733320a0e5c72e90 100644
--- a/src/starsphere/StarsphereRadio.cpp
+++ b/src/starsphere/StarsphereRadio.cpp
@@ -158,10 +158,10 @@ void StarsphereRadio::refreshBOINCInformation()
 	buffer.str("");
 
 	// show WU's total CPU time (previously accumulated + current session)
-	const double time = m_BoincAdapter.wuCPUTimeSpent() + m_EinsteinAdapter.wuCPUTime();
-	const int hrs = time / 3600;
-	const int min = fmod(time, 3600) / 60;
-	const int sec = fmod(time, 60);
+	const double timeCPU = m_BoincAdapter.wuCPUTimeSpent() + m_EinsteinAdapter.wuCPUTime();
+	const int hrs = timeCPU / 3600;
+	const int min = fmod(timeCPU, 3600) / 60;
+	const int sec = fmod(timeCPU, 60);
 
 	buffer << "WU CPU Time: " << right << setw(2) << hrs << ":"
 							  << right << setw(2) << min << ":"
diff --git a/src/starsphere/StarsphereS5R3.cpp b/src/starsphere/StarsphereS5R3.cpp
index f175249f822d074a7f17271ced1c7dab448035b8..88c2e5b9adf9765cb4b67fbfe525fcf48f33eeb7 100644
--- a/src/starsphere/StarsphereS5R3.cpp
+++ b/src/starsphere/StarsphereS5R3.cpp
@@ -20,6 +20,8 @@
 
 #include "StarsphereS5R3.h"
 
+#include <time.h>
+
 StarsphereS5R3::StarsphereS5R3() :
 	Starsphere(EinsteinS5R3Adapter::SharedMemoryIdentifier),
 	m_EinsteinAdapter(&m_BoincAdapter)
@@ -98,10 +100,10 @@ void StarsphereS5R3::refreshBOINCInformation()
 	m_WUPercentDone = buffer.str();
 
 	// show WU's total CPU time (previously accumulated + current session)
-	double time = m_BoincAdapter.wuCPUTimeSpent() + m_EinsteinAdapter.wuCPUTime();
-	int hrs = time / 3600;
-	int min = fmod(time, 3600) / 60;
-	int sec = fmod(time, 60);
+	double timeCPU = m_BoincAdapter.wuCPUTimeSpent() + m_EinsteinAdapter.wuCPUTime();
+	int hrs = timeCPU / 3600;
+	int min = fmod(timeCPU, 3600) / 60;
+	int sec = fmod(timeCPU, 60);
 
 	buffer.str("");
 	buffer << "CPU Time: "  << right << setw(2) << hrs << ":"
@@ -111,17 +113,12 @@ void StarsphereS5R3::refreshBOINCInformation()
 	m_WUCPUTime = buffer.str();
 
 	// update current time string (clock)
-	time = dtime() - dday();
-	hrs = time / 3600;
-	min = fmod(time, 3600) / 60;
-	sec = fmod(time, 60);
-
-	buffer.str("");
-	buffer << right << setw(2) << hrs << ":"
-		   << right << setw(2) << min << ":"
-		   << right << setw(2) << sec << ends;
+	char cBuffer[10] = {0};
+    time_t timeNow = time(0);
+    struct tm* timeLocal = localtime(&timeNow);
+    strftime(cBuffer, sizeof(cBuffer) - 1, "%H:%M:%S", timeLocal);
 
-	m_CurrentTime = buffer.str();
+	m_CurrentTime = string(cBuffer);
 }
 
 void StarsphereS5R3::renderSearchInformation()