diff --git a/libupower-glib/up-history-item.c b/libupower-glib/up-history-item.c
index 685cc08..8e0b89f 100644
--- a/libupower-glib/up-history-item.c
+++ b/libupower-glib/up-history-item.c
@@ -116,12 +116,12 @@ up_history_item_set_time (UpHistoryItem *history_item, guint time)
 void
 up_history_item_set_time_to_present (UpHistoryItem *history_item)
 {
-	GTimeVal timeval;
+	guint64 time_now;
 
 	g_return_if_fail (UP_IS_HISTORY_ITEM (history_item));
 
-	g_get_current_time (&timeval);
-	history_item->priv->time = timeval.tv_sec;
+	time_now = g_get_real_time ();
+	history_item->priv->time = time_now / 1000000;
 	g_object_notify (G_OBJECT(history_item), "time");
 }
 
diff --git a/src/linux/up-device-supply-battery.c b/src/linux/up-device-supply-battery.c
index 456f692..a5e68a4 100644
--- a/src/linux/up-device-supply-battery.c
+++ b/src/linux/up-device-supply-battery.c
@@ -47,10 +47,10 @@ enum {
 
 struct _UpDeviceSupplyBattery
 {
+	UpDeviceBattery		 parent;
 	gboolean		 has_coldplug_values;
 	gboolean		 coldplug_units;
 	gdouble			*energy_old;
-	GTimeVal		*energy_old_timespec;
 	guint			 energy_old_first;
 	gdouble			 rate_old;
 	gboolean		 shown_invalid_voltage_warning;
diff --git a/src/up-history.c b/src/up-history.c
index 2664fba..0333feb 100644
--- a/src/up-history.c
+++ b/src/up-history.c
@@ -203,7 +203,7 @@ up_history_copy_array_timespan (const GPtrArray *array, guint timespan)
 	guint i;
 	UpHistoryItem *item;
 	GPtrArray *array_new;
-	GTimeVal timeval;
+	gint64 time_now;
 
 	/* no data */
 	if (array->len == 0)
@@ -217,14 +217,14 @@ up_history_copy_array_timespan (const GPtrArray *array, guint timespan)
 
 	/* new data */
 	array_new = g_ptr_array_new ();
-	g_get_current_time (&timeval);
+	time_now = g_get_real_time ();
 	g_debug ("limiting data to last %i seconds", timespan);
 
 	/* treat the timespan like a range, and search backwards */
 	timespan *= 0.95f;
 	for (i=array->len-1; i>0; i--) {
 		item = (UpHistoryItem *) g_ptr_array_index (array, i);
-		if (timeval.tv_sec - up_history_item_get_time (item) < timespan)
+		if ((time_now / 1000000) - up_history_item_get_time (item) < timespan)
 			g_ptr_array_add (array_new, g_object_ref (item));
 	}
 out:
@@ -429,12 +429,12 @@ up_history_array_to_file (UpHistory *history, GPtrArray *list, const gchar *file
 	GString *string;
 	gboolean ret = TRUE;
 	GError *error = NULL;
-	GTimeVal time_now;
+	gint64 time_now;
 	guint time_item;
 	guint cull_count = 0;
 
 	/* get current time */
-	g_get_current_time (&time_now);
+	time_now = g_get_real_time ();
 
 	/* generate data */
 	string = g_string_new ("");
@@ -443,7 +443,7 @@ up_history_array_to_file (UpHistory *history, GPtrArray *list, const gchar *file
 
 		/* only save entries for the last 24 hours */
 		time_item = up_history_item_get_time (item);
-		if (time_now.tv_sec - time_item > history->priv->max_data_age) {
+		if ((time_now / 1000000) - time_item > history->priv->max_data_age) {
 			cull_count++;
 			continue;
 		}