diff --git a/net-mail/zarafa/ChangeLog b/net-mail/zarafa/ChangeLog
index 574c012..247f0ec 100644
--- a/net-mail/zarafa/ChangeLog
+++ b/net-mail/zarafa/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  01 Feb 2012; Mario Fetka <mario.fetka@gmail.com>
+  +files/7.0.4.31235/zarafa-7.0.3-php54.patch:
+  add php 5.4 support
+
 *zarafa-7.0.4.31235 (31 Jan 2012)
 *zarafa-6.40.14.31537 (31 Jan 2012)
 
diff --git a/net-mail/zarafa/Manifest b/net-mail/zarafa/Manifest
index a8a08bc..845449a 100644
--- a/net-mail/zarafa/Manifest
+++ b/net-mail/zarafa/Manifest
@@ -81,6 +81,7 @@ AUX 7.0.4.31235/Datux-spamhook.patch 9895 RMD160 b1143f3e2057ee8d1b0a03e75708650
 AUX 7.0.4.31235/zarafa-6.40.1-no-php-conf.patch 1634 RMD160 1bb4d4357aeeec0b005cd090beb96cb73905f58d SHA1 3da975c330bf09eca894db87aa1888536ee1e206 SHA256 ec79e127c30aeb93fe455bbebbd426645d4d8aa3e1031005ff9177d7f7b9685f
 AUX 7.0.4.31235/zarafa-6.40.2-libtcmalloc_shared-1.patch 857 RMD160 c9b89cad232b513db8dad25dba9a7a3b6cdcf007 SHA1 c4d332881ab985f817c8d5c4848f4ec2be91d050 SHA256 82b9e69f6fdb00dea3cdbbc4bdfa94b61303fa022891e1ef0763f019cbe0f350
 AUX 7.0.4.31235/zarafa-7.0.0-package.patch 2285 RMD160 ad3f385e60a3d4b52ee831bb7c47739d7324569b SHA1 1bb2a88bd8c25be566f169688b41d583eae4d0a8 SHA256 01a0b3a7acc54273bfdd6d84b67e6fd90d85b63f981f687035897d0516ef86fb
+AUX 7.0.4.31235/zarafa-7.0.3-php54.patch 4019 RMD160 3432ef42cd7c315a6c2d4c9aafa3fec04a77de5a SHA1 269c7c76e8859c9a2367262e314b8ae220d73902 SHA256 1929e734001df9b8514097c242dd7bb07c54ef7a3423505a7b748532f506a371
 AUX 7.0.4.31235/zarafa-7.0.3-sysconfig2confd-1.patch 4759 RMD160 662deed2e46ccc8e35b8e1c52560637a71342919 SHA1 5615c66fdb1bdf83eb691a8051f4e05d0b930e29 SHA256 8de14eb05d7ae145583a6e07fded24c3b4e2d272cc75845f6bcd3a4e4a47b967
 AUX junklearn.dspam 924 RMD160 84a39d3297c075f3e4906b40cd84be8e47b90690 SHA1 cfd81182aaec691e7f415709d0db3189bbf9366c SHA256 5060aa1c0fd3e103c0243f5372ec4a393d4aebc7ed7c69a9475adead50d6b37e
 AUX zarafa-dagent.rc6 2016 RMD160 45cbcb81da30a34be4202f3d9b84f38b12ecf57b SHA1 aaccebd9658dc8da88a32f7300922557fd4c621c SHA256 696d0f7b0c41814ca15d775b0595eb46b95fc59e1cf2a30935eba2c717ff16d6
@@ -192,5 +193,5 @@ EBUILD zarafa-6.40.8.27223.ebuild 6567 RMD160 83e20fc877c6d5f50d4b85f7b9d6b957c9
 EBUILD zarafa-6.40.9.27553.ebuild 9033 RMD160 bc86e8eadf58d619774ea62aaf869d00b477df5d SHA1 23d7461f0614ccabe5fe7377ee1590291937d5b7 SHA256 bcf13aaaeb85e536a6aed59ae670bef33c562c5d7efc6a38d79fd04b0bba8716
 EBUILD zarafa-7.0.3.30515.ebuild 9864 RMD160 6906d05b84d9ddfcd44e7b4059317db111f1c349 SHA1 a87f520414186045eb8b1bbae1fb3823306aeb07 SHA256 84d3ceeb8d4ded58a0074037e307af5a593a39f15e686ba8f262e5425e3728aa
 EBUILD zarafa-7.0.4.31235.ebuild 9864 RMD160 6906d05b84d9ddfcd44e7b4059317db111f1c349 SHA1 a87f520414186045eb8b1bbae1fb3823306aeb07 SHA256 84d3ceeb8d4ded58a0074037e307af5a593a39f15e686ba8f262e5425e3728aa
-MISC ChangeLog 10638 RMD160 9c8fc6c69426a50e4de5c52e5dc6eac0cbd90cf2 SHA1 70f12a06f24bbf1898a42a392fceef1dd573cbb9 SHA256 1bbf693640af2362753c3804f3d1003907c5fffa1aa1cf74c9e82030253abe0d
+MISC ChangeLog 10759 RMD160 229abbb92ca85c518cccc560abe24af39a04cd05 SHA1 5c641c2a597412ed8882029004c3606860a46247 SHA256 4e94ff44ab44d850c13b522e1cc7fcc811eeda161e69feb1660785f9f24045e2
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
diff --git a/net-mail/zarafa/files/7.0.4.31235/zarafa-7.0.3-php54.patch b/net-mail/zarafa/files/7.0.4.31235/zarafa-7.0.3-php54.patch
new file mode 100644
index 0000000..256c456
--- /dev/null
+++ b/net-mail/zarafa/files/7.0.4.31235/zarafa-7.0.3-php54.patch
@@ -0,0 +1,123 @@
+diff -up zarafa-7.0.3/php-ext/ECImportContentsChangesProxy.cpp.php54 zarafa-7.0.3/php-ext/ECImportContentsChangesProxy.cpp
+--- zarafa-7.0.3/php-ext/ECImportContentsChangesProxy.cpp.php54	2011-12-29 07:57:08.047623136 +0100
++++ zarafa-7.0.3/php-ext/ECImportContentsChangesProxy.cpp	2011-12-29 07:58:57.717628057 +0100
+@@ -150,9 +150,9 @@ HRESULT ECImportContentsChangesProxy::Ge
+ HRESULT ECImportContentsChangesProxy::Config(LPSTREAM lpStream, ULONG ulFlags) {
+     HRESULT hr = hrSuccess;
+     
+-    pval *pvalFuncName;
+-    pval *pvalReturn;
+-    pval *pvalArgs[2];
++    zval *pvalFuncName;
++    zval *pvalReturn;
++    zval *pvalArgs[2];
+     
+     MAKE_STD_ZVAL(pvalFuncName);
+     MAKE_STD_ZVAL(pvalReturn);
+@@ -192,9 +192,9 @@ exit:
+ HRESULT ECImportContentsChangesProxy::UpdateState(LPSTREAM lpStream) {
+     HRESULT hr = hrSuccess;
+     
+-    pval *pvalFuncName;
+-    pval *pvalReturn;
+-    pval *pvalArgs[1];
++    zval *pvalFuncName;
++    zval *pvalReturn;
++    zval *pvalArgs[1];
+     
+     MAKE_STD_ZVAL(pvalFuncName);
+     MAKE_STD_ZVAL(pvalReturn);
+@@ -228,9 +228,9 @@ exit:
+ }
+ 
+ HRESULT ECImportContentsChangesProxy::ImportMessageChange(ULONG cValues, LPSPropValue lpPropArray, ULONG ulFlags, LPMESSAGE * lppMessage)  {
+-    pval *pvalFuncName;
+-    pval *pvalReturn;
+-    pval *pvalArgs[3];
++    zval *pvalFuncName;
++    zval *pvalReturn;
++    zval *pvalArgs[3];
+     IMessage *lpMessage = NULL;
+     HRESULT hr = hrSuccess;
+     
+@@ -287,9 +287,9 @@ exit:
+ HRESULT ECImportContentsChangesProxy::ImportMessageDeletion(ULONG ulFlags, LPENTRYLIST lpSourceEntryList) {
+     HRESULT hr = hrSuccess;
+     
+-    pval *pvalFuncName;
+-    pval *pvalReturn;
+-    pval *pvalArgs[2];
++    zval *pvalFuncName;
++    zval *pvalReturn;
++    zval *pvalArgs[2];
+     
+     MAKE_STD_ZVAL(pvalFuncName);
+     MAKE_STD_ZVAL(pvalReturn);
+@@ -323,9 +323,9 @@ exit:
+ HRESULT ECImportContentsChangesProxy::ImportPerUserReadStateChange(ULONG cElements, LPREADSTATE lpReadState) {
+     HRESULT hr = hrSuccess;
+     
+-    pval *pvalFuncName;
+-    pval *pvalReturn;
+-    pval *pvalArgs[1];
++    zval *pvalFuncName;
++    zval *pvalReturn;
++    zval *pvalArgs[1];
+     
+     MAKE_STD_ZVAL(pvalFuncName);
+     MAKE_STD_ZVAL(pvalReturn);
+diff -up zarafa-7.0.3/php-ext/ECImportHierarchyChangesProxy.cpp.php54 zarafa-7.0.3/php-ext/ECImportHierarchyChangesProxy.cpp
+--- zarafa-7.0.3/php-ext/ECImportHierarchyChangesProxy.cpp.php54	2011-12-29 07:59:13.901628896 +0100
++++ zarafa-7.0.3/php-ext/ECImportHierarchyChangesProxy.cpp	2011-12-29 07:59:42.559630070 +0100
+@@ -147,9 +147,9 @@ HRESULT ECImportHierarchyChangesProxy::G
+ HRESULT ECImportHierarchyChangesProxy::Config(LPSTREAM lpStream, ULONG ulFlags) {
+     HRESULT hr = hrSuccess;
+     
+-    pval *pvalFuncName;
+-    pval *pvalReturn;
+-    pval *pvalArgs[2];
++    zval *pvalFuncName;
++    zval *pvalReturn;
++    zval *pvalArgs[2];
+     
+     MAKE_STD_ZVAL(pvalFuncName);
+     MAKE_STD_ZVAL(pvalReturn);
+@@ -189,9 +189,9 @@ exit:
+ HRESULT ECImportHierarchyChangesProxy::UpdateState(LPSTREAM lpStream) {
+     HRESULT hr = hrSuccess;
+     
+-    pval *pvalFuncName;
+-    pval *pvalReturn;
+-    pval *pvalArgs[1];
++    zval *pvalFuncName;
++    zval *pvalReturn;
++    zval *pvalArgs[1];
+     
+     MAKE_STD_ZVAL(pvalFuncName);
+     MAKE_STD_ZVAL(pvalReturn);
+@@ -225,9 +225,9 @@ exit:
+ }
+ 
+ HRESULT ECImportHierarchyChangesProxy::ImportFolderChange(ULONG cValues, LPSPropValue lpPropArray)  {
+-    pval *pvalFuncName;
+-    pval *pvalReturn;
+-    pval *pvalArgs[1];
++    zval *pvalFuncName;
++    zval *pvalReturn;
++    zval *pvalArgs[1];
+     HRESULT hr = hrSuccess;
+     
+     MAKE_STD_ZVAL(pvalFuncName);
+@@ -265,9 +265,9 @@ exit:
+ HRESULT ECImportHierarchyChangesProxy::ImportFolderDeletion(ULONG ulFlags, LPENTRYLIST lpSourceEntryList) {
+     HRESULT hr = hrSuccess;
+     
+-    pval *pvalFuncName;
+-    pval *pvalReturn;
+-    pval *pvalArgs[2];
++    zval *pvalFuncName;
++    zval *pvalReturn;
++    zval *pvalArgs[2];
+     
+     MAKE_STD_ZVAL(pvalFuncName);
+     MAKE_STD_ZVAL(pvalReturn);