Index: Template/Timestampable.php
===================================================================
--- Template/Timestampable.php	(revision 2)
+++ Template/Timestampable.php	(working copy)
@@ -42,15 +42,15 @@
      */
     protected $_options = array('created' =>  array('name'          =>  'created_at',
                                                     'alias'         =>  null,
-                                                    'type'          =>  'timestamp',
-                                                    'format'        =>  'Y-m-d H:i:s',
+                                                    'type'          =>  'timestamptz',
+                                                    'format'        =>  'Y-m-d H:i:s O',
                                                     'disabled'      =>  false,
                                                     'expression'    =>  false,
                                                     'options'       =>  array('notnull' => true)),
                                 'updated' =>  array('name'          =>  'updated_at',
                                                     'alias'         =>  null,
-                                                    'type'          =>  'timestamp',
-                                                    'format'        =>  'Y-m-d H:i:s',
+                                                    'type'          =>  'timestamptz',
+                                                    'format'        =>  'Y-m-d H:i:s O',
                                                     'disabled'      =>  false,
                                                     'expression'    =>  false,
                                                     'onInsert'      =>  true,
@@ -81,4 +81,4 @@
 
         $this->addListener(new Doctrine_Template_Listener_Timestampable($this->_options));
     }
-}
\ No newline at end of file
+}
Index: Template/Listener/Timestampable.php
===================================================================
--- Template/Listener/Timestampable.php	(revision 2)
+++ Template/Listener/Timestampable.php	(working copy)
@@ -130,9 +130,12 @@
                 return date($options['format'], time());
             } else if ($options['type'] == 'timestamp') {
                 return date($options['format'], time());
-            } else {
+	    } else if ($options['type'] == 'timestamptz') {
+	        return date($options['format'], time());
+	    } else {
                 return time();
             }
         }
     }
-}
\ No newline at end of file
+}
+