diff --git a/nova/virt/zvm/instance.py b/nova/virt/zvm/instance.py
index 45a8c65..6364ae9 100644
--- a/nova/virt/zvm/instance.py
+++ b/nova/virt/zvm/instance.py
@@ -384,6 +384,10 @@ class ZVMInstance(object):
             (lun, wwpn, size,
              fcp) = self._volumeop.extract_connection_info(context,
                                                             connection_info)
+            if len(wwpn) > 16:
+                # a wwpn list similar to:
+                #   5005076800aa0001;5005076800aa0002;5005076800aa0003
+                wwpn = wwpn.split(';')[0]
 
             (kernel_parm_string, scpdata) = self._forge_hex_scpdata(fcp,
                                                         wwpn, lun, volume_meta)