diff --git a/ChangeLog b/ChangeLog
index 5c417f91..63af531e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-05 Bahadır Kandemir <bahadir@pardus.org.tr>
+        * Increase DBus timeout
+        * Always set COMAR client locale
+
 2009-05-04 Fatih Aşıcı <fatih@pardus.org.tr>
         * Change distribution release to 2009.
 
diff --git a/pisi/comariface.py b/pisi/comariface.py
index b36825c4..801db5cd 100644
--- a/pisi/comariface.py
+++ b/pisi/comariface.py
@@ -77,6 +77,7 @@ def get_link():
     while timeout > 0:
         try:
             link = comar.Link(socket=sockname, alternate=alternate)
+            link.setLocale()
             return link
         except dbus.DBusException, e:
             exceptions.append(str(e))
diff --git a/pisi/context.py b/pisi/context.py
index e12f4f3f..d5e59e6f 100644
--- a/pisi/context.py
+++ b/pisi/context.py
@@ -40,7 +40,7 @@ stderr = None
 comar = True
 comar_updated = False
 dbus_sockname = None
-dbus_timeout = 300
+dbus_timeout = 60 * 60 # in seconds
 
 # Bug #2879
 # FIXME: Maybe we can create a simple rollback mechanism. There are other