diff --git a/addressbook/export/Netscape_LDIF b/addressbook/export/Netscape_LDIF
index ab2b9557af..6d988c9afd 100644
--- a/addressbook/export/Netscape_LDIF
+++ b/addressbook/export/Netscape_LDIF
@@ -40,6 +40,7 @@
 			"ophone"              => "xmozillaanyphone",
 			"tel_cell"            => "cellphone",
 			"note"                => "description",
+			"ophone"              => "ophone",
 			"tel_pager"           => "pagerphone",
 			"email"               => "mail",
 			"url"                 => "homeurl",
@@ -84,7 +85,12 @@
 			$buffer[$this->id]["dn"]                          = 'cn='.$buffer[$this->id]["cn"].',mail='.$buffer[$this->id]["mail"];
 			$buffer[$this->id]["xmozillauseconferenceserver"] = "";
 			$buffer[$this->id]["xmozillanickname"]            = "";
-			$buffer[$this->id]["xmozillausehtmlmail"]         = "";
+			$buffer[$this->id]["xmozillausehtmlmail"]         = "False";
+			if ($buffer[$this->id]["ophone"]) {
+				$buffer[$this->id]["xmozillaanyphone"]        = $buffer[$this->id]["ophone"];
+			} else {
+				$buffer[$this->id]["xmozillaanyphone"]        = $buffer[$this->id]["telephonenumber"];
+			}
 			//echo '<br>'.$this->id.' - '.$buffer[$this->id]['dn'];
 			return $buffer;
 		}
@@ -102,6 +108,7 @@
 				$entries .= "xmozillauseconferenceserver: " . $buffer[$i]["xmozillauseconferenceserver"] . "\n";
 				$entries .= "xmozillanickname: "            . $buffer[$i]["xmozillanickname"] . "\n";
 				$entries .= "xmozillausehtmlmail: "         . $buffer[$i]["xmozillausehtmlmail"] . "\n";
+				$entries .= "xmozillaanyphone: "            . $buffer[$this->id]["xmozillaanyphone"] . "\n";
 				$entries .= "objectClass: person\n";
 				$entries .= "objectClass: account\n";
 				$entries .= "objectClass: organizationalPerson\n";