diff --git a/elements/fedora/bin/map-packages b/elements/fedora/bin/map-packages
index 2b200086..d21e28fe 100755
--- a/elements/fedora/bin/map-packages
+++ b/elements/fedora/bin/map-packages
@@ -42,6 +42,7 @@ package_map = {
     'libssl-dev': 'openssl-devel',
     'libz-dev': 'zlib-devel',
     'qemu-utils': 'qemu-img',
+    'python-pyopenssl': 'pyOpenSSL',
     }
 
 for arg in sys.argv[1:]:
diff --git a/elements/fedora/install.d/00-fedora-fixup-pyopenssl b/elements/fedora/install.d/00-fedora-fixup-pyopenssl
new file mode 100755
index 00000000..270487fa
--- /dev/null
+++ b/elements/fedora/install.d/00-fedora-fixup-pyopenssl
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# FIXME: To avoid conflict between the pyOpenSSL installed via python-pip
+# and pyOpenSSL installed via yum, we are going to sort it out installing
+# it earlier at the beginning of the image building process. Pyhton-pip
+# is installing pyOpenSSL as part of satisfying the requirements.txt
+# in python-glanceclient and afterwards yum tries to install it as a
+# dependency of the python-paste package needed for the heat element,
+# this seems to be conflicting and causing the image building process to
+# fail. The problem is hapenning on a Fedora 18 system.
+install-packages python-pyopenssl