diff --git a/serendipity_event_trackback/ChangeLog b/serendipity_event_trackback/ChangeLog
index ae53d760..e0f335d9 100644
--- a/serendipity_event_trackback/ChangeLog
+++ b/serendipity_event_trackback/ChangeLog
@@ -1,15 +1,30 @@
-1.16: 
+1.17:
+-----
+   * use lang API - requires S9y 1.6
+   * fix some inconsistencies
+   * fix table "delayed_trackbacks" creation
+
+1.16.1:
+-------
+   * Fixed error when saving an entry, which would loose its category association
+
+1.16:
+-----
    * Fixed error when saving an entry, which would loose its category association
 
 1.15:
+-----
     * Fixed foreach warning in some cases
 
 1.14:
+-----
     * Fixed bad SQL table create statement
 
 1.13:
+-----
     * Issue SQL statement compatible with pgsql, thanks to ads
    
 1.12:
+-----
     * Added delayed trackbacks, generating those of entries published
       to the future
diff --git a/serendipity_event_trackback/UTF-8/lang_bg.inc.php b/serendipity_event_trackback/UTF-8/lang_bg.inc.php
index 257ccd93..215b5daf 100644
--- a/serendipity_event_trackback/UTF-8/lang_bg.inc.php
+++ b/serendipity_event_trackback/UTF-8/lang_bg.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -12,3 +12,4 @@
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKOWN', 'Изпращане на проследявания към вашия собствен блог ?');
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKALL', 'Глобална забрана на проследяванията ?');
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKSEL', 'Проследявания само за URLs, показани по-долу');
+
diff --git a/serendipity_event_trackback/UTF-8/lang_cs.inc.php b/serendipity_event_trackback/UTF-8/lang_cs.inc.php
index 526b71fe..a4af6ceb 100644
--- a/serendipity_event_trackback/UTF-8/lang_cs.inc.php
+++ b/serendipity_event_trackback/UTF-8/lang_cs.inc.php
@@ -18,4 +18,5 @@
 
 // Next lines were translated on 2010/05/02
 @define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_NAME',		'Pozdržené odezvy');
-@define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_DESC',		'Automaticky vytvářet odezvy článků, které nebyly okamžitě publikovány.');
\ No newline at end of file
+@define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_DESC',		'Automaticky vytvářet odezvy článků, které nebyly okamžitě publikovány.');
+
diff --git a/serendipity_event_trackback/UTF-8/lang_cz.inc.php b/serendipity_event_trackback/UTF-8/lang_cz.inc.php
index 526b71fe..a4af6ceb 100644
--- a/serendipity_event_trackback/UTF-8/lang_cz.inc.php
+++ b/serendipity_event_trackback/UTF-8/lang_cz.inc.php
@@ -18,4 +18,5 @@
 
 // Next lines were translated on 2010/05/02
 @define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_NAME',		'Pozdržené odezvy');
-@define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_DESC',		'Automaticky vytvářet odezvy článků, které nebyly okamžitě publikovány.');
\ No newline at end of file
+@define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_DESC',		'Automaticky vytvářet odezvy článků, které nebyly okamžitě publikovány.');
+
diff --git a/serendipity_event_trackback/UTF-8/lang_de.inc.php b/serendipity_event_trackback/UTF-8/lang_de.inc.php
index 54d17c2a..d2034544 100644
--- a/serendipity_event_trackback/UTF-8/lang_de.inc.php
+++ b/serendipity_event_trackback/UTF-8/lang_de.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETITLE', 'Trackbacks kontrollieren');
 @define('PLUGIN_EVENT_MTRACKBACK_TITLEDESC', 'Ermöglicht beim Anlegen eines Eintrages zu weiteren URLs Trackbacks zu schicken oder Trackbacks zu deaktivieren');
diff --git a/serendipity_event_trackback/UTF-8/lang_ja.inc.php b/serendipity_event_trackback/UTF-8/lang_ja.inc.php
index 33680f97..4d9ba0ed 100644
--- a/serendipity_event_trackback/UTF-8/lang_ja.inc.php
+++ b/serendipity_event_trackback/UTF-8/lang_ja.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -12,4 +12,3 @@
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKOWN', '自分のブログにトラックバックを送信しますか?');
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKALL', '自動的なトラックバックを全体に使うことを無効にしますか?');
 
-?>
diff --git a/serendipity_event_trackback/UTF-8/lang_pl.inc.php b/serendipity_event_trackback/UTF-8/lang_pl.inc.php
index 108c16f4..84d9ba9c 100644
--- a/serendipity_event_trackback/UTF-8/lang_pl.inc.php
+++ b/serendipity_event_trackback/UTF-8/lang_pl.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -12,4 +12,3 @@
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKOWN', 'Wysyłać ślady do własnego bloga?');
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKALL', 'Wyłączyć globalnie obsługę śladów?');
 
-?>
diff --git a/serendipity_event_trackback/lang_bg.inc.php b/serendipity_event_trackback/lang_bg.inc.php
index 4150a68d..83f9aee9 100644
--- a/serendipity_event_trackback/lang_bg.inc.php
+++ b/serendipity_event_trackback/lang_bg.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -12,3 +12,4 @@
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKOWN', '��������� �� ������������� ��� ����� �������� ���� ?');
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKALL', '�������� ������� �� ��������������� ?');
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKSEL', '������������� ���� �� URLs, �������� ��-����');
+
diff --git a/serendipity_event_trackback/lang_cs.inc.php b/serendipity_event_trackback/lang_cs.inc.php
index 0df720c4..c84bc1ab 100644
--- a/serendipity_event_trackback/lang_cs.inc.php
+++ b/serendipity_event_trackback/lang_cs.inc.php
@@ -18,4 +18,5 @@
 
 // Next lines were translated on 2010/05/02
 @define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_NAME',		'Pozdr�en� odezvy');
-@define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_DESC',		'Automaticky vytv��et odezvy �l�nk�, kter� nebyly okam�it� publikov�ny.');
\ No newline at end of file
+@define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_DESC',		'Automaticky vytv��et odezvy �l�nk�, kter� nebyly okam�it� publikov�ny.');
+
diff --git a/serendipity_event_trackback/lang_cz.inc.php b/serendipity_event_trackback/lang_cz.inc.php
index f4f12f9e..4b01486e 100644
--- a/serendipity_event_trackback/lang_cz.inc.php
+++ b/serendipity_event_trackback/lang_cz.inc.php
@@ -18,4 +18,5 @@
 
 // Next lines were translated on 2010/05/02
 @define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_NAME',		'Pozdr�en� odezvy');
-@define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_DESC',		'Automaticky vytv��et odezvy �l�nk�, kter� nebyly okam�it� publikov�ny.');
\ No newline at end of file
+@define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_DESC',		'Automaticky vytv��et odezvy �l�nk�, kter� nebyly okam�it� publikov�ny.');
+
diff --git a/serendipity_event_trackback/lang_de.inc.php b/serendipity_event_trackback/lang_de.inc.php
index 68a6c340..0b00a9b8 100644
--- a/serendipity_event_trackback/lang_de.inc.php
+++ b/serendipity_event_trackback/lang_de.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETITLE', 'Trackbacks kontrollieren');
 @define('PLUGIN_EVENT_MTRACKBACK_TITLEDESC', 'Erm�glicht beim Anlegen eines Eintrages zu weiteren URLs Trackbacks zu schicken oder Trackbacks zu deaktivieren');
diff --git a/serendipity_event_trackback/lang_en.inc.php b/serendipity_event_trackback/lang_en.inc.php
index 12c6222e..dd07559e 100644
--- a/serendipity_event_trackback/lang_en.inc.php
+++ b/serendipity_event_trackback/lang_en.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -15,4 +15,3 @@
 @define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_NAME', 'Delayed Trackbacks');
 @define('PLUGIN_EVENT_MTRACKBACK_DELAYED_TRACKBACKS_DESC', 'Automatically create trackbacks of entries which were not released immediately.');
 
-?>
diff --git a/serendipity_event_trackback/lang_ja.inc.php b/serendipity_event_trackback/lang_ja.inc.php
index 49dc26ef..110f889f 100644
--- a/serendipity_event_trackback/lang_ja.inc.php
+++ b/serendipity_event_trackback/lang_ja.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -12,4 +12,3 @@
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKOWN', '自分のブログにトラックバックを送信しますか?');
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKALL', '全体でトラックバックを使うことを無効にしますか?');
 
-?>
diff --git a/serendipity_event_trackback/lang_pl.inc.php b/serendipity_event_trackback/lang_pl.inc.php
index d97ffc7a..f67237ae 100644
--- a/serendipity_event_trackback/lang_pl.inc.php
+++ b/serendipity_event_trackback/lang_pl.inc.php
@@ -1,4 +1,4 @@
-<?php # 
+<?php
 
 /**
  *  @version 
@@ -12,4 +12,3 @@
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKOWN', 'Wysy�a� �lady do w�asnego bloga?');
 @define('PLUGIN_EVENT_MTRACKBACK_TITLETRACKALL', 'Wy��czy� globalnie obs�ug� �lad�w?');
 
-?>
diff --git a/serendipity_event_trackback/serendipity_event_trackback.php b/serendipity_event_trackback/serendipity_event_trackback.php
index 45e80f1f..24770ef3 100644
--- a/serendipity_event_trackback/serendipity_event_trackback.php
+++ b/serendipity_event_trackback/serendipity_event_trackback.php
@@ -1,17 +1,10 @@
-<?php # 
+<?php
 
 if (IN_serendipity !== true) {
     die ("Don't hack!");
 }
 
-
-// Probe for a language include with constants. Still include defines later on, if some constants were missing
-$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
-if (file_exists($probelang)) {
-    include $probelang;
-}
-
-include dirname(__FILE__) . '/lang_en.inc.php';
+@serendipity_plugin_api::load_language(dirname(__FILE__));
 
 class serendipity_event_trackback extends serendipity_event
 {
@@ -26,20 +19,20 @@ class serendipity_event_trackback extends serendipity_event
         $propbag->add('description',   PLUGIN_EVENT_MTRACKBACK_TITLEDESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Garvin Hicking, Malte Paskuda');
-        $propbag->add('version',       '1.16.1');
+        $propbag->add('version',       '1.17');
         $propbag->add('requirements',  array(
-            'serendipity' => '0.8',
+            'serendipity' => '1.6',
             'smarty'      => '2.6.7',
             'php'         => '4.1.0'
         ));
         $propbag->add('event_hooks',    array(
-            'backend_display' => true,
-            'backend_trackbacks' => true,
-            'backend_trackback_check' => true,
-            'backend_http_request' => true,
-            'genpage' => true,
-            'backend_publish' => true,
-            'backend_save' => true
+            'backend_display'           => true,
+            'backend_trackbacks'        => true,
+            'backend_trackback_check'   => true,
+            'backend_http_request'      => true,
+            'genpage'                   => true,
+            'backend_publish'           => true,
+            'backend_save'              => true
         ));
         $propbag->add('configuration', array('disable_trackall', 'trackown', 'delayed_trackbacks', 'host', 'port', 'user', 'password'));
         $propbag->add('groups', array('BACKEND_EDITOR'));
@@ -90,25 +83,31 @@ class serendipity_event_trackback extends serendipity_event
                  $propbag->add('type',        'string');
                  $propbag->add('name',        'Proxy Password');
                  $propbag->add('default',     '');
-                 break;
+                break;
+
+            default:
+                return false;
         }
         return true;
     }
 
-    function generate_content(&$title) {
+    function generate_content(&$title)
+    {
         $title = PLUGIN_EVENT_MTRACKBACK_TITLETITLE;
     }
 
-    function install() {
+    function install()
+    {
         $this->setupDB();
     }
 
-    function event_hook($event, &$bag, &$eventData, $addData = null) {
+    function event_hook($event, &$bag, &$eventData, $addData = null)
+    {
         global $serendipity;
 
         $hooks = &$bag->get('event_hooks');
         if (isset($hooks[$event])) {
-            
+
             switch($event) {
                 case 'backend_http_request':
                     // Setup a Proxy?
@@ -119,8 +118,6 @@ class serendipity_event_trackback extends serendipity_event
                         $eventData['proxy_user'] = $this->get_config('user');
                         $eventData['proxy_pass'] = $this->get_config('password');
                     }
-
-                    return true;
                     break;
 
                 case 'backend_trackbacks':
@@ -154,8 +151,6 @@ class serendipity_event_trackback extends serendipity_event
                             }
                         }
                     }
-
-                    return true;
                     break;
 
                 case 'backend_trackback_check':
@@ -164,8 +159,6 @@ class serendipity_event_trackback extends serendipity_event
                         $eventData[2] = $addData;
                         $eventData['skipValidate'] = true;
                     }
-
-                    return true;
                     break;
 
                 case 'backend_display':
@@ -208,7 +201,6 @@ class serendipity_event_trackback extends serendipity_event
                                 <textarea rows="5" cols="50" id="input_additional_trackbacks" name="serendipity[additional_trackbacks]"><?php echo trim(implode("\n", $trackbackURLs)); ?></textarea>
                     </fieldset>
 <?php
-                    return true;
                     break;
 
                 case 'backend_save':
@@ -221,30 +213,30 @@ class serendipity_event_trackback extends serendipity_event
                         ) {
                         #trackbacks couldn't get generated, so store this entry
                         $this->delay($eventData['id'], $eventData['timestamp']);
-                        
                     }
-                    return true;
                     break;
+
                 case 'genpage':
                     #don't check on every page
                     $try = mt_rand(1, 10);
                     if ($try == 1 && serendipity_db_bool($this->get_config('delayed_trackbacks', true))) {
                         $this->generateDelayed();
                     }
-                    return true;
                     break;
 
                 default:
                     return false;
-                    break;
+
             }
+            return true;
         } else {
             return false;
         }
     }
 
-     #store id of an entry and wanted release-timestamp 
-    function delay($id, $timestamp) {
+    #store id of an entry and wanted release-timestamp
+    function delay($id, $timestamp)
+    {
         global $serendipity;
         $this->upgradeCheck();
         $this->removeDelayed($id);
@@ -256,10 +248,11 @@ class serendipity_event_trackback extends serendipity_event
     }
 
     #generate trackbacks for entries which now are shown
-    function generateDelayed() {
+    function generateDelayed()
+    {
         global $serendipity;
         $this->upgradeCheck();
-        
+
         $sql = "SELECT id, timestamp
                 FROM
                     {$serendipity['dbPrefix']}delayed_trackbacks";
@@ -269,9 +262,9 @@ class serendipity_event_trackback extends serendipity_event
             foreach ($entries as $entry) {
                 if ($entry['timestamp'] <= serendipity_serverOffsetHour()) {
                     include_once S9Y_INCLUDE_PATH . 'include/functions_trackbacks.inc.php';
-                    
+
                     $stored_entry = serendipity_fetchEntry('id', $entry['id'], 1, 1);
-                    
+
                     if (isset($_SESSION['serendipityRightPublish'])) {
                         $oldPublighRights = $_SESSION['serendipityRightPublish'];
                     } else {
@@ -285,12 +278,12 @@ class serendipity_event_trackback extends serendipity_event
                     if (isset($stored_entry['email'])) {
                         unset($stored_entry['email']);
                     }
-                    
-                    # Convert fetched categories to storable categories.    
+
+                    # Convert fetched categories to storable categories.
                     $current_cat = $stored_entry['categories'];
                     $stored_entry['categories'] = array();
                     foreach($current_cat AS $categoryidx => $category_data) {
-	                $stored_entry['categories'][$category_data['categoryid']] = $category_data['categoryid'];
+                        $stored_entry['categories'][$category_data['categoryid']] = $category_data['categoryid'];
                     }
 
                     ob_start();
@@ -310,7 +303,8 @@ class serendipity_event_trackback extends serendipity_event
     }
 
     #remove delayed entry from further use
-    function removeDelayed($id) {
+    function removeDelayed($id)
+    {
         global $serendipity;
         $sql = "DELETE FROM
                  {$serendipity['dbPrefix']}delayed_trackbacks
@@ -318,33 +312,39 @@ class serendipity_event_trackback extends serendipity_event
         serendipity_db_query($sql);
     }
 
-    function setupDB() {
-	    global $serendipity;
-		$sql = "CREATE TABLE {$serendipity['dbPrefix']}delayed_trackbacks (
-id int(11) NOT NULL ,
-timestamp int(10) {UNSIGNED},
-PRIMARY KEY (id)
-)";
-		serendipity_db_schema_import ( $sql );
-
-// Hotfix; better to check for pgsql vs. mysql here, but I didn't have time and needed this fixed for my install
-		$sql = "CREATE TABLE {$serendipity['dbPrefix']}delayed_trackbacks (
-id int(11) NOT NULL ,
-timestamp int(10) {UNSIGNED}
-PRIMARY KEY (id)
-)";
-		serendipity_db_schema_import ( $sql );
-
+    function setupDB()
+    {
+        global $serendipity;
+        if (preg_match('@(postgres|pgsql)@i', $serendipity['dbType'])) {
+            // postgres < 9.3 IF NOT EXISTS workaround...
+            $c = serendipity_db_query("SELECT COUNT(*) FROM {$serendipity['dbPrefix']}delayed_trackbacks;");
+            if ((int)$c >= 0) {
+                return;
+            } else {
+                $sql = "CREATE TABLE {$serendipity['dbPrefix']}delayed_trackbacks (
+                        id int(11) NOT NULL,
+                        timestamp int(10) {UNSIGNED},
+                        PRIMARY KEY (id))";
+            }
+        } else {
+            $sql = "CREATE TABLE IF NOT EXISTS {$serendipity['dbPrefix']}delayed_trackbacks (
+                    id int(11) NOT NULL,
+                    timestamp int(10) {UNSIGNED}
+                    PRIMARY KEY (id))";
+        }
+        serendipity_db_schema_import ( $sql ));
     }
 
-    function upgradeCheck() {
+    function upgradeCheck()
+    {
         $db_upgrade = serendipity_db_bool($this->get_config('db_upgrade', 2));
         if ((int)$db_upgrade !== 2) {
             $this->setupDB();
             $this->set_config('db_upgrade', 2);
         }
     }
-    
+
 }
 
 /* vim: set sts=4 ts=4 expandtab : */
+?>
\ No newline at end of file