diff --git a/addressbook/export/Netscape_LDIF b/addressbook/export/Netscape_LDIF
index 4e5643733a..93f26b365f 100644
--- a/addressbook/export/Netscape_LDIF
+++ b/addressbook/export/Netscape_LDIF
@@ -75,6 +75,11 @@
 		// name/value are the fields from the export array above
 		function export_new_attrib($buffer,$name,$value) {
 			if ($this->export[$name]) {
+				if (strstr($value,"\n")) {
+					$value = ": ".base64_encode($value);
+				} else {
+					 $value = " ".$value;
+				}
 				$buffer[$this->id][$this->export[$name]] = $value;
 				//echo '<br>'.$this->id.' - '.$this->export[$name].': '.$buffer[$this->id][$this->export[$name]];
 			}
@@ -103,7 +108,7 @@
 				reset($this->export);
 				while (list($name,$value)=each($this->export)) {
 					if ($value != 'dn') {
-						$entries .= $value . ": " . $buffer[$i][$value] . "\n";
+						$entries .= $value . ":" . $buffer[$i][$value] . "\n";
 					}
 				}
 				$entries .= "xmozillauseconferenceserver: " . $buffer[$i]["xmozillauseconferenceserver"] . "\n";
diff --git a/addressbook/export/phpgw_LDIF b/addressbook/export/phpgw_LDIF
index ca5ceb350b..286c910c1a 100644
--- a/addressbook/export/phpgw_LDIF
+++ b/addressbook/export/phpgw_LDIF
@@ -42,8 +42,8 @@
 			"url"                 => "url",
 			"pubkey"              => "publickey",
 
-			"org_name"            => "o",  // company
-			"org_unit"            => "ou",  // division
+			"org_name"            => "phpgworgname",  // company
+			"org_unit"            => "phpgworgunit",  // division
 			"title"               => "title",
 
 			"adr_one_street"      => "street",