diff --git a/phpgwapi/inc/horde/Horde/SyncML/State.php b/phpgwapi/inc/horde/Horde/SyncML/State.php
index 14a1cbe8a2..e065bf36ad 100644
--- a/phpgwapi/inc/horde/Horde/SyncML/State.php
+++ b/phpgwapi/inc/horde/Horde/SyncML/State.php
@@ -138,12 +138,12 @@ define('RESPONSE_ATOMIC_RESPONSE_TOO_LARGE', 517);
 define('NAME_SPACE_URI_SYNCML_1_0', 'syncml:syncml1.0');
 define('NAME_SPACE_URI_SYNCML_1_1', 'syncml:syncml1.1');
 define('NAME_SPACE_URI_SYNCML_1_2', 'syncml:syncml1.2');
-define('NAME_SPACE_URI_METINF_1_0', 'syncml:metinf');
-define('NAME_SPACE_URI_METINF_1_1', 'syncml:metinf');
-define('NAME_SPACE_URI_METINF_1_2', 'syncml:metinf');
-define('NAME_SPACE_URI_DEVINF_1_0', 'syncml:devinf');
-define('NAME_SPACE_URI_DEVINF_1_1', 'syncml:devinf');
-define('NAME_SPACE_URI_DEVINF_1_2', 'syncml:devinf');
+define('NAME_SPACE_URI_METINF_1_0', 'syncml:metinf1.0');
+define('NAME_SPACE_URI_METINF_1_1', 'syncml:metinf1.1');
+define('NAME_SPACE_URI_METINF_1_2', 'syncml:metinf1.2');
+define('NAME_SPACE_URI_DEVINF_1_0', 'syncml:devinf1.0');
+define('NAME_SPACE_URI_DEVINF_1_1', 'syncml:devinf1.1');
+define('NAME_SPACE_URI_DEVINF_1_2', 'syncml:devinf1.2');
 
 define('CLIENT_SYNC_STARTED',		1);
 define('CLIENT_SYNC_FINNISHED',		2);
diff --git a/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php b/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php
index 7306b351cd..0e1ff72b5f 100644
--- a/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php
+++ b/phpgwapi/inc/horde/XML/WBXML/ContentHandler.php
@@ -27,7 +27,7 @@ class XML_WBXML_ContentHandler {
 
     /**
      * WBXML Version.
-     * 1, 2, or 3 supported
+     * 0, 1 or 2 supported
      */
     var $_wbxmlVersion = 2;
 
@@ -63,7 +63,7 @@ class XML_WBXML_ContentHandler {
 
     function setVersion($v)
     {
-        $this->_wbxmlVersion = 2;
+        $this->_wbxmlVersion = $v;
     }
 
     function getOutput()
diff --git a/phpgwapi/inc/horde/XML/WBXML/Decoder.php b/phpgwapi/inc/horde/XML/WBXML/Decoder.php
index c2591619f6..a51540eb4f 100644
--- a/phpgwapi/inc/horde/XML/WBXML/Decoder.php
+++ b/phpgwapi/inc/horde/XML/WBXML/Decoder.php
@@ -145,7 +145,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
 
         // Get Version Number from Section 5.4
         // version = u_int8
-        // currently 1, 2 or 3
+        // currently 0, 1 or 2
         $this->_wbxmlVersion = $this->getVersionNumber($wbxml);
         #Horde::logMessage("WBXML[" . $this->_strpos . "] version " . $this->_wbxmlVersion, __FILE__, __LINE__, PEAR_LOG_DEBUG);