diff --git a/src/hamster-service.py b/src/hamster-service.py
index 29e7c1e06..496b04a05 100755
--- a/src/hamster-service.py
+++ b/src/hamster-service.py
@@ -154,7 +154,7 @@ def AddFact(self, fact_str, start_time, end_time, temporary):
         Returns:
             fact id (int), 0 means failure.
 
-        Note: see datetime.utcfromtimestamp documentation
+        Note: see datetime.fromtimestamp documentation
               for the precise meaning of timestamps.
         """
         fact = Fact.parse(fact_str)
@@ -166,12 +166,12 @@ def AddFact(self, fact_str, start_time, end_time, temporary):
         if start_time == -1:
             fact.start_time = None
         elif start_time != 0:
-            fact.start_time = dt.datetime.utcfromtimestamp(start_time)
+            fact.start_time = dt.datetime.fromtimestamp(start_time, dt.UTC)
 
         if end_time == -1:
             fact.end_time = None
         elif end_time != 0:
-            fact.end_time = dt.datetime.utcfromtimestamp(end_time)
+            fact.end_time = dt.datetime.fromtimestamp(end_time, dt.UTC)
 
         return self.add_fact(fact)
 
@@ -249,11 +249,11 @@ def GetFactJSON(self, fact_id):
     def UpdateFact(self, fact_id, fact, start_time, end_time, temporary):
         start_time = start_time or None
         if start_time:
-            start_time = dt.datetime.utcfromtimestamp(start_time)
+            start_time = dt.datetime.fromtimestamp(start_time, dt.UTC)
 
         end_time = end_time or None
         if end_time:
-            end_time = dt.datetime.utcfromtimestamp(end_time)
+            end_time = dt.datetime.fromtimestamp(end_time, dt.UTC)
         return self.update_fact(fact_id, fact, start_time, end_time, temporary)
 
 
@@ -278,7 +278,7 @@ def StopTracking(self, end_time):
         """Stops tracking the current activity"""
         end_time = end_time or None
         if end_time:
-            end_time = dt.datetime.utcfromtimestamp(end_time)
+            end_time = dt.datetime.fromtimestamp(end_time, dt.UTC)
         return self.stop_tracking(end_time)
 
 
@@ -310,11 +310,11 @@ def GetFacts(self, start_date, end_date, search_terms):
         #TODO: Assert start > end ?
         start = dt.date.today()
         if start_date:
-            start = dt.datetime.utcfromtimestamp(start_date).date()
+            start = dt.datetime.fromtimestamp(start_date, dt.UTC).date()
 
         end = None
         if end_date:
-            end = dt.datetime.utcfromtimestamp(end_date).date()
+            end = dt.datetime.fromtimestamp(end_date, dt.UTC).date()
 
         return [to_dbus_fact(fact) for fact in self.get_facts(start, end, search_terms)]
 
diff --git a/src/hamster/lib/dbus.py b/src/hamster/lib/dbus.py
index f282e4fdc..c412da600 100644
--- a/src/hamster/lib/dbus.py
+++ b/src/hamster/lib/dbus.py
@@ -95,8 +95,8 @@ def from_dbus_fact(dbus_fact):
     Legacy: to besuperceded by from_dbus_fact_json at some point.
     """
     return Fact(activity=dbus_fact[4],
-                start_time=dt.datetime.utcfromtimestamp(dbus_fact[1]),
-                end_time=dt.datetime.utcfromtimestamp(dbus_fact[2]) if dbus_fact[2] else None,
+                start_time=dt.datetime.fromtimestamp(dbus_fact[1], dt.UTC),
+                end_time=dt.datetime.fromtimestamp(dbus_fact[2], dt.UTC) if dbus_fact[2] else None,
                 description=dbus_fact[3],
                 activity_id=dbus_fact[5],
                 category=dbus_fact[6],