diff --git a/heimdal/7.5.0-names-clash-with-openssl.patch b/heimdal/7.5.0-names-clash-with-openssl.patch
new file mode 100644
index 00000000..b4d67b4a
--- /dev/null
+++ b/heimdal/7.5.0-names-clash-with-openssl.patch
@@ -0,0 +1,83 @@
+diff -Naur heimdal-heimdal-7.5.0-orig/lib/hcrypto/camellia.c heimdal-heimdal-7.5.0/lib/hcrypto/camellia.c
+--- heimdal-heimdal-7.5.0-orig/lib/hcrypto/camellia.c	2017-12-08 10:48:25.000000000 +0300
++++ heimdal-heimdal-7.5.0/lib/hcrypto/camellia.c	2018-07-06 15:55:40.543752700 +0300
+@@ -46,7 +46,7 @@
+ 		 const int bits, CAMELLIA_KEY *key)
+ {
+     key->bits = bits;
+-    Camellia_Ekeygen(bits, userkey, key->key);
++    Camellia_Ekeygen_Heimdal(bits, userkey, key->key);
+     return 1;
+ }
+ 
+@@ -54,7 +54,7 @@
+ CAMELLIA_encrypt(const unsigned char *in, unsigned char *out,
+ 		 const CAMELLIA_KEY *key)
+ {
+-    Camellia_EncryptBlock(key->bits, in, key->key, out);
++    Camellia_EncryptBlock_Heimdal(key->bits, in, key->key, out);
+ 
+ }
+ 
+@@ -62,7 +62,7 @@
+ CAMELLIA_decrypt(const unsigned char *in, unsigned char *out,
+ 		 const CAMELLIA_KEY *key)
+ {
+-    Camellia_DecryptBlock(key->bits, in, key->key, out);
++    Camellia_DecryptBlock_Heimdal(key->bits, in, key->key, out);
+ }
+ 
+ void
+diff -Naur heimdal-heimdal-7.5.0-orig/lib/hcrypto/camellia-ntt.c heimdal-heimdal-7.5.0/lib/hcrypto/camellia-ntt.c
+--- heimdal-heimdal-7.5.0-orig/lib/hcrypto/camellia-ntt.c	2017-12-08 10:48:25.000000000 +0300
++++ heimdal-heimdal-7.5.0/lib/hcrypto/camellia-ntt.c	2018-07-06 15:55:36.097744900 +0300
+@@ -1383,7 +1383,7 @@
+  * API for compatibility
+  */
+ 
+-void Camellia_Ekeygen(const int keyBitLength,
++void Camellia_Ekeygen_Heimdal(const int keyBitLength,
+ 		      const unsigned char *rawKey,
+ 		      KEY_TABLE_TYPE keyTable)
+ {
+@@ -1403,7 +1403,7 @@
+ }
+ 
+ 
+-void Camellia_EncryptBlock(const int keyBitLength,
++void Camellia_EncryptBlock_Heimdal(const int keyBitLength,
+ 			   const unsigned char *plaintext,
+ 			   const KEY_TABLE_TYPE keyTable,
+ 			   unsigned char *ciphertext)
+@@ -1434,7 +1434,7 @@
+     PUTU32(ciphertext + 12, tmp[3]);
+ }
+ 
+-void Camellia_DecryptBlock(const int keyBitLength,
++void Camellia_DecryptBlock_Heimdal(const int keyBitLength,
+ 			   const unsigned char *ciphertext,
+ 			   const KEY_TABLE_TYPE keyTable,
+ 			   unsigned char *plaintext)
+diff -Naur heimdal-heimdal-7.5.0-orig/lib/hcrypto/camellia-ntt.h heimdal-heimdal-7.5.0/lib/hcrypto/camellia-ntt.h
+--- heimdal-heimdal-7.5.0-orig/lib/hcrypto/camellia-ntt.h	2017-12-08 10:48:25.000000000 +0300
++++ heimdal-heimdal-7.5.0/lib/hcrypto/camellia-ntt.h	2018-07-06 15:55:39.389350700 +0300
+@@ -43,16 +43,16 @@
+ typedef u32 KEY_TABLE_TYPE[CAMELLIA_TABLE_WORD_LEN];
+ 
+ 
+-void Camellia_Ekeygen(const int keyBitLength,
++void Camellia_Ekeygen_Heimdal(const int keyBitLength,
+ 		      const unsigned char *rawKey,
+ 		      KEY_TABLE_TYPE keyTable);
+ 
+-void Camellia_EncryptBlock(const int keyBitLength,
++void Camellia_EncryptBlock_Heimdal(const int keyBitLength,
+ 			   const unsigned char *plaintext,
+ 			   const KEY_TABLE_TYPE keyTable,
+ 			   unsigned char *cipherText);
+ 
+-void Camellia_DecryptBlock(const int keyBitLength,
++void Camellia_DecryptBlock_Heimdal(const int keyBitLength,
+ 			   const unsigned char *cipherText,
+ 			   const KEY_TABLE_TYPE keyTable,
+ 			   unsigned char *plaintext);
diff --git a/heimdal/PKGBUILD b/heimdal/PKGBUILD
index 4cbcce9b..5b313950 100644
--- a/heimdal/PKGBUILD
+++ b/heimdal/PKGBUILD
@@ -3,7 +3,7 @@
 pkgbase=heimdal
 pkgname=('heimdal' 'heimdal-libs' 'heimdal-devel')
 pkgver=7.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Implementation of Kerberos V5 libraries"
 arch=('i686' 'x86_64')
 url="https://www.h5l.org/"
@@ -19,7 +19,8 @@ source=(https://github.com/heimdal/heimdal/archive/heimdal-${pkgver}.tar.gz
         1.5.3-missing-libs-pkg-config.patch
         1.5.3-fix-detect-libedit.patch
         7.5.0-use-python2.patch
-        7.5.0-hcrypto-build-fix.patch)
+        7.5.0-hcrypto-build-fix.patch
+        7.5.0-names-clash-with-openssl.patch)
 sha256sums=('ad67fef994dc2268fb0b1a8164b39330d184f425057867485a178e9785a7f35a'
             'b18c9ca3f2db08cea0a4b7d7f07e8656360af848b3a30a5fa8d748240989da49'
             'a99f0f5b69d32524399b1343a4f08b2de43351828b5b45a938f72bacb0eb9085'
@@ -28,7 +29,8 @@ sha256sums=('ad67fef994dc2268fb0b1a8164b39330d184f425057867485a178e9785a7f35a'
             'eecd77ec817f88406f315c1b21559d888f1e0b3182aad317031f7ebc62f69b5b'
             'bb96587539084c2ea9e06da8d2b4c768edd8dd422587a045ea60d1aa3eeb6a8a'
             '59186e1a69c927e7c4c88423a726ed2592b39ec98f57ecd84ec96f12330f4743'
-            'f387721cc311a82ce2d4793187957d5323aa773538ea3268175741712534f8d4')
+            'f387721cc311a82ce2d4793187957d5323aa773538ea3268175741712534f8d4'
+            'bfe321c0391d6f7e23abecc22e9941bcb79d0b67abb9975246a9f462ec32513b')
 
 prepare() {
   cd ${srcdir}/heimdal-heimdal-${pkgver}
@@ -41,6 +43,7 @@ prepare() {
   patch -p1 -i "${srcdir}"/1.5.3-fix-detect-libedit.patch
   patch -p1 -i "${srcdir}"/7.5.0-use-python2.patch
   patch -p1 -i "${srcdir}"/7.5.0-hcrypto-build-fix.patch
+  patch -p1 -i "${srcdir}"/7.5.0-names-clash-with-openssl.patch
 
   ./autogen.sh
 }