diff --git libcloud/compute/drivers/bluebox.py libcloud/compute/drivers/bluebox.py
index 9cd88fe..69af66e 100644
--- libcloud/compute/drivers/bluebox.py
+++ libcloud/compute/drivers/bluebox.py
@@ -130,6 +130,7 @@ class BlueboxNodeDriver(NodeDriver):
     type = Provider.BLUEBOX
     api_name = 'bluebox'
     name = 'Bluebox Blocks'
+    website = 'http://bluebox.net'
 
     def list_nodes(self):
         result = self.connection.request('/api/blocks.json')
diff --git libcloud/compute/drivers/brightbox.py libcloud/compute/drivers/brightbox.py
index 41ee1c5..5ca63fd 100644
--- libcloud/compute/drivers/brightbox.py
+++ libcloud/compute/drivers/brightbox.py
@@ -43,6 +43,7 @@ class BrightboxNodeDriver(NodeDriver):
 
     type = Provider.BRIGHTBOX
     name = 'Brightbox'
+    website = 'http://www.brightbox.co.uk/'
     features = {'create_node': ['ssh_key']}
 
     NODE_STATE_MAP = {'creating': NodeState.PENDING,
diff --git libcloud/compute/drivers/cloudsigma.py libcloud/compute/drivers/cloudsigma.py
index 7ca8c73..7d18344 100644
--- libcloud/compute/drivers/cloudsigma.py
+++ libcloud/compute/drivers/cloudsigma.py
@@ -204,6 +204,7 @@ class CloudSigmaBaseConnection(ConnectionUserAndKey):
 class CloudSigmaBaseNodeDriver(NodeDriver):
     type = Provider.CLOUDSIGMA
     name = 'CloudSigma'
+    website = 'http://www.cloudsigma.com/'
     connectionCls = CloudSigmaBaseConnection
 
     def reboot_node(self, node):
diff --git libcloud/compute/drivers/cloudstack.py libcloud/compute/drivers/cloudstack.py
index 997c20d..e8a0012 100644
--- libcloud/compute/drivers/cloudstack.py
+++ libcloud/compute/drivers/cloudstack.py
@@ -101,6 +101,7 @@ class CloudStackNodeDriver(CloudStackDriverMixIn, NodeDriver):
 
     name = 'CloudStack'
     api_name = 'cloudstack'
+    website = 'http://cloudstack.org/'
     type = Provider.CLOUDSTACK
 
     NODE_STATE_MAP = {
diff --git libcloud/compute/drivers/dreamhost.py libcloud/compute/drivers/dreamhost.py
index ff41c49..f7e29e7 100644
--- libcloud/compute/drivers/dreamhost.py
+++ libcloud/compute/drivers/dreamhost.py
@@ -128,6 +128,7 @@ class DreamhostNodeDriver(NodeDriver):
     type = Provider.DREAMHOST
     api_name = 'dreamhost'
     name = "Dreamhost"
+    website = 'http://dreamhost.com/'
     connectionCls = DreamhostConnection
 
     _sizes = DH_PS_SIZES
diff --git libcloud/compute/drivers/dummy.py libcloud/compute/drivers/dummy.py
index 5e00f1e..752b307 100644
--- libcloud/compute/drivers/dummy.py
+++ libcloud/compute/drivers/dummy.py
@@ -64,6 +64,7 @@ class DummyNodeDriver(NodeDriver):
     """
 
     name = "Dummy Node Provider"
+    website = 'http://example.com'
     type = Provider.DUMMY
 
     def __init__(self, creds):
diff --git libcloud/compute/drivers/ec2.py libcloud/compute/drivers/ec2.py
index e5ee800..ae14472 100644
--- libcloud/compute/drivers/ec2.py
+++ libcloud/compute/drivers/ec2.py
@@ -287,6 +287,7 @@ class EC2NodeDriver(NodeDriver):
     type = Provider.EC2
     api_name = 'ec2_us_east'
     name = 'Amazon EC2 (us-east-1)'
+    website = 'http://aws.amazon.com/ec2/'
     friendly_name = 'Amazon US N. Virginia'
     country = 'US'
     region_name = 'us-east-1'
diff --git libcloud/compute/drivers/ecp.py libcloud/compute/drivers/ecp.py
index 5a83229..da8943a 100644
--- libcloud/compute/drivers/ecp.py
+++ libcloud/compute/drivers/ecp.py
@@ -124,6 +124,7 @@ class ECPNodeDriver(NodeDriver):
     """
 
     name = "Enomaly Elastic Computing Platform"
+    website = 'http://www.enomaly.com/'
     type = Provider.ECP
     connectionCls = ECPConnection
 
diff --git libcloud/compute/drivers/elastichosts.py libcloud/compute/drivers/elastichosts.py
index 3b10aa8..1b9980e 100644
--- libcloud/compute/drivers/elastichosts.py
+++ libcloud/compute/drivers/elastichosts.py
@@ -115,6 +115,7 @@ class ElasticHostsBaseNodeDriver(ElasticStackBaseNodeDriver):
     type = Provider.ELASTICHOSTS
     api_name = 'elastichosts'
     name = 'ElasticHosts'
+    website = 'http://www.elastichosts.com/'
     connectionCls = ElasticHostsBaseConnection
     features = {"create_node": ["generates_password"]}
     _standard_drives = STANDARD_DRIVES
diff --git libcloud/compute/drivers/elasticstack.py libcloud/compute/drivers/elasticstack.py
index bbc1009..ecb9a5c 100644
--- libcloud/compute/drivers/elasticstack.py
+++ libcloud/compute/drivers/elasticstack.py
@@ -163,6 +163,8 @@ class ElasticStackBaseConnection(ConnectionUserAndKey):
 
 
 class ElasticStackBaseNodeDriver(NodeDriver):
+
+    website = 'http://www.elasticstack.com'
     connectionCls = ElasticStackBaseConnection
     features = {"create_node": ["generates_password"]}
 
diff --git libcloud/compute/drivers/gandi.py libcloud/compute/drivers/gandi.py
index 41aa6e2..ac6dde6 100644
--- libcloud/compute/drivers/gandi.py
+++ libcloud/compute/drivers/gandi.py
@@ -46,6 +46,7 @@ class GandiNodeDriver(BaseGandiDriver, NodeDriver):
     """
     api_name = 'gandi'
     friendly_name = 'Gandi.net'
+    website = 'http://www.gandi.net/'
     country = 'FR'
     type = Provider.GANDI
     # TODO : which features to enable ?
diff --git libcloud/compute/drivers/gogrid.py libcloud/compute/drivers/gogrid.py
index 0a17cfe..ec00076 100644
--- libcloud/compute/drivers/gogrid.py
+++ libcloud/compute/drivers/gogrid.py
@@ -98,6 +98,7 @@ class GoGridNodeDriver(BaseGoGridDriver, NodeDriver):
     type = Provider.GOGRID
     api_name = 'gogrid'
     name = 'GoGrid'
+    website = 'http://www.gogrid.com/'
     features = {"create_node": ["generates_password"]}
 
     _instance_types = GOGRID_INSTANCE_TYPES
diff --git libcloud/compute/drivers/ibm_sce.py libcloud/compute/drivers/ibm_sce.py
index 3f8c1ba..71aa3be 100644
--- libcloud/compute/drivers/ibm_sce.py
+++ libcloud/compute/drivers/ibm_sce.py
@@ -75,6 +75,7 @@ class IBMNodeDriver(NodeDriver):
     connectionCls = IBMConnection
     type = Provider.IBM
     name = "IBM SmartCloud Enterprise"
+    website = 'http://ibm.com/services/us/en/cloud-enterprise/'
 
     NODE_STATE_MAP = {0: NodeState.PENDING,      # New
                       1: NodeState.PENDING,      # Provisioning
diff --git libcloud/compute/drivers/joyent.py libcloud/compute/drivers/joyent.py
index 26a3d48..4dc7d5a 100644
--- libcloud/compute/drivers/joyent.py
+++ libcloud/compute/drivers/joyent.py
@@ -92,6 +92,7 @@ class JoyentNodeDriver(NodeDriver):
 
     type = Provider.JOYENT
     name = 'Joyent'
+    website = 'http://www.joyentcloud.com'
     connectionCls = JoyentConnection
     features = {'create_node': ['generates_password']}
 
diff --git libcloud/compute/drivers/ktucloud.py libcloud/compute/drivers/ktucloud.py
index 2d48186..b100060 100644
--- libcloud/compute/drivers/ktucloud.py
+++ libcloud/compute/drivers/ktucloud.py
@@ -25,6 +25,7 @@ class KTUCloudNodeDriver(CloudStackNodeDriver):
 
     type = Provider.KTUCLOUD
     name = 'KTUCloud'
+    website = 'https://ucloudbiz.olleh.com/'
 
     def list_images(self, location=None):
         args = {
diff --git libcloud/compute/drivers/libvirt_driver.py libcloud/compute/drivers/libvirt_driver.py
index 715fbf0..6da6b80 100644
--- libcloud/compute/drivers/libvirt_driver.py
+++ libcloud/compute/drivers/libvirt_driver.py
@@ -33,6 +33,8 @@ class LibvirtNodeDriver(NodeDriver):
     """
 
     type = Provider.LIBVIRT
+    name = 'Libvirt'
+    website = 'http://libvirt.org/'
 
     NODE_STATE_MAP = {
         0: NodeState.TERMINATED,
diff --git libcloud/compute/drivers/linode.py libcloud/compute/drivers/linode.py
index 38b17fc..4a9b560 100644
--- libcloud/compute/drivers/linode.py
+++ libcloud/compute/drivers/linode.py
@@ -71,6 +71,7 @@ class LinodeNodeDriver(NodeDriver):
     """
     type = Provider.LINODE
     name = "Linode"
+    website = 'http://www.linode.com/'
     connectionCls = LinodeConnection
     _linode_plan_ids = LINODE_PLAN_IDS
 
diff --git libcloud/compute/drivers/ninefold.py libcloud/compute/drivers/ninefold.py
index 945c72e..e860a94 100644
--- libcloud/compute/drivers/ninefold.py
+++ libcloud/compute/drivers/ninefold.py
@@ -25,3 +25,4 @@ class NinefoldNodeDriver(CloudStackNodeDriver):
 
     type = Provider.NINEFOLD
     name = 'Ninefold'
+    website = 'http://ninefold.com/'
diff --git libcloud/compute/drivers/opennebula.py libcloud/compute/drivers/opennebula.py
index b8b9961..c79aeb0 100644
--- libcloud/compute/drivers/opennebula.py
+++ libcloud/compute/drivers/opennebula.py
@@ -265,6 +265,7 @@ class OpenNebulaNodeDriver(NodeDriver):
 
     connectionCls = OpenNebulaConnection
     name = 'OpenNebula'
+    website = 'http://opennebula.org/'
     type = Provider.OPENNEBULA
 
     NODE_STATE_MAP = {
diff --git libcloud/compute/drivers/openstack.py libcloud/compute/drivers/openstack.py
index d3d96e3..8c442ae 100644
--- libcloud/compute/drivers/openstack.py
+++ libcloud/compute/drivers/openstack.py
@@ -152,6 +152,9 @@ class OpenStackNodeDriver(NodeDriver, OpenStackDriverMixin):
     """
     Base OpenStack node driver. Should not be used directly.
     """
+    api_name = 'openstack'
+    name = 'OpenStack'
+    website = 'http://openstack.org/'
 
     NODE_STATE_MAP = {
         'BUILD': NodeState.PENDING,
@@ -270,8 +273,6 @@ class OpenStack_1_0_NodeDriver(OpenStackNodeDriver):
     """
     connectionCls = OpenStack_1_0_Connection
     type = Provider.OPENSTACK
-    api_name = 'openstack'
-    name = 'OpenStack'
 
     features = {"create_node": ["generates_password"]}
 
@@ -786,8 +787,6 @@ class OpenStack_1_1_NodeDriver(OpenStackNodeDriver):
     """
     connectionCls = OpenStack_1_1_Connection
     type = Provider.OPENSTACK
-    api_name = 'openstack'
-    name = 'OpenStack'
 
     features = {"create_node": ["generates_password"]}
 
diff --git libcloud/compute/drivers/opsource.py libcloud/compute/drivers/opsource.py
index 8a303c9..bf5b6f5 100644
--- libcloud/compute/drivers/opsource.py
+++ libcloud/compute/drivers/opsource.py
@@ -239,6 +239,7 @@ class OpsourceNodeDriver(NodeDriver):
 
     connectionCls = OpsourceConnection
     name = 'Opsource'
+    website = 'http://www.opsource.net/'
     type = Provider.OPSOURCE
     features = {"create_node": ["password"]}
 
diff --git libcloud/compute/drivers/rackspace.py libcloud/compute/drivers/rackspace.py
index d378977..733da2b 100644
--- libcloud/compute/drivers/rackspace.py
+++ libcloud/compute/drivers/rackspace.py
@@ -49,6 +49,7 @@ class RackspaceConnection(OpenStack_1_0_Connection):
 
 class RackspaceNodeDriver(OpenStack_1_0_NodeDriver):
     name = 'Rackspace'
+    website = 'http://www.rackspace.com/'
     connectionCls = RackspaceConnection
     type = Provider.RACKSPACE
     api_name = 'rackspace'
diff --git libcloud/compute/drivers/rackspacenova.py libcloud/compute/drivers/rackspacenova.py
index cae40b3..da13c59 100644
--- libcloud/compute/drivers/rackspacenova.py
+++ libcloud/compute/drivers/rackspacenova.py
@@ -58,6 +58,7 @@ class RackspaceNovaDfwConnection(RackspaceNovaConnection):
 
 class RackspaceNovaDfwNodeDriver(OpenStack_1_1_NodeDriver):
     name = 'RackspaceNovadfw'
+    website = 'http://www.rackspace.com/'
     connectionCls = RackspaceNovaDfwConnection
     type = Provider.RACKSPACE_NOVA_DFW
     api_name = 'rackspacenovadfw'
@@ -65,6 +66,7 @@ class RackspaceNovaDfwNodeDriver(OpenStack_1_1_NodeDriver):
 
 class RackspaceNovaBetaNodeDriver(OpenStack_1_1_NodeDriver):
     name = 'RackspaceNovaBeta'
+    website = 'http://www.rackspace.com/'
     connectionCls = RackspaceNovaBetaConnection
     type = Provider.RACKSPACE_NOVA_BETA
     api_name = 'rackspacenovabeta'
diff --git libcloud/compute/drivers/rimuhosting.py libcloud/compute/drivers/rimuhosting.py
index e0518a4..f9c8e1b 100644
--- libcloud/compute/drivers/rimuhosting.py
+++ libcloud/compute/drivers/rimuhosting.py
@@ -109,6 +109,7 @@ class RimuHostingNodeDriver(NodeDriver):
 
     type = Provider.RIMUHOSTING
     name = 'RimuHosting'
+    website = 'http://rimuhosting.com/'
     connectionCls = RimuHostingConnection
 
     def __init__(self, key, host=API_HOST, port=443,
diff --git libcloud/compute/drivers/serverlove.py libcloud/compute/drivers/serverlove.py
index 4b27c64..2ba92a9 100644
--- libcloud/compute/drivers/serverlove.py
+++ libcloud/compute/drivers/serverlove.py
@@ -76,6 +76,7 @@ class ServerLoveConnection(ElasticStackBaseConnection):
 class ServerLoveNodeDriver(ElasticStackBaseNodeDriver):
     type = Provider.SERVERLOVE
     api_name = 'serverlove'
+    website = 'http://www.serverlove.com/'
     name = 'ServerLove'
     connectionCls = ServerLoveConnection
     features = {'create_node': ['generates_password']}
diff --git libcloud/compute/drivers/skalicloud.py libcloud/compute/drivers/skalicloud.py
index 791d077..c0b0d79 100644
--- libcloud/compute/drivers/skalicloud.py
+++ libcloud/compute/drivers/skalicloud.py
@@ -77,6 +77,7 @@ class SkaliCloudNodeDriver(ElasticStackBaseNodeDriver):
     type = Provider.SKALICLOUD
     api_name = 'skalicloud'
     name = 'skalicloud'
+    website = 'http://www.skalicloud.com/'
     connectionCls = SkaliCloudConnection
     features = {"create_node": ["generates_password"]}
     _standard_drives = STANDARD_DRIVES
diff --git libcloud/compute/drivers/slicehost.py libcloud/compute/drivers/slicehost.py
index 31ea52f..cdf8cf5 100644
--- libcloud/compute/drivers/slicehost.py
+++ libcloud/compute/drivers/slicehost.py
@@ -66,6 +66,7 @@ class SlicehostNodeDriver(NodeDriver):
 
     type = Provider.SLICEHOST
     name = 'Slicehost'
+    website = 'http://slicehost.com/'
 
     features = {"create_node": ["generates_password"]}
 
diff --git libcloud/compute/drivers/softlayer.py libcloud/compute/drivers/softlayer.py
index 565273c..321d506 100644
--- libcloud/compute/drivers/softlayer.py
+++ libcloud/compute/drivers/softlayer.py
@@ -240,6 +240,7 @@ class SoftLayerNodeDriver(NodeDriver):
     """
     connectionCls = SoftLayerConnection
     name = 'SoftLayer'
+    website = 'http://www.softlayer.com/'
     type = Provider.SOFTLAYER
 
     features = {"create_node": ["generates_password"]}
diff --git libcloud/compute/drivers/vcl.py libcloud/compute/drivers/vcl.py
index accea31..3276dfd 100644
--- libcloud/compute/drivers/vcl.py
+++ libcloud/compute/drivers/vcl.py
@@ -124,6 +124,7 @@ class VCLNodeDriver(NodeDriver):
 
     connectionCls = VCLConnection
     name = 'VCL'
+    website = 'http://incubator.apache.org/vcl/'
     type = Provider.VCL
 
     def __init__(self, key, secret, secure=True, host=None, port=None, *args,
diff --git libcloud/compute/drivers/vcloud.py libcloud/compute/drivers/vcloud.py
index da39c20..662959b 100644
--- libcloud/compute/drivers/vcloud.py
+++ libcloud/compute/drivers/vcloud.py
@@ -302,6 +302,7 @@ class VCloudNodeDriver(NodeDriver):
 
     type = Provider.VCLOUD
     name = 'vCloud'
+    website = 'http://www.vmware.com/products/vcloud/'
     connectionCls = VCloudConnection
     org = None
     _vdcs = None
diff --git libcloud/compute/drivers/voxel.py libcloud/compute/drivers/voxel.py
index 4ea3f3e..249941b 100644
--- libcloud/compute/drivers/voxel.py
+++ libcloud/compute/drivers/voxel.py
@@ -118,6 +118,7 @@ class VoxelNodeDriver(NodeDriver):
     connectionCls = VoxelConnection
     type = Provider.VOXEL
     name = 'Voxel VoxCLOUD'
+    website = 'http://www.voxel.net/'
 
     def _initialize_instance_types():
         for cpus in range(1,14):
diff --git libcloud/compute/drivers/vpsnet.py libcloud/compute/drivers/vpsnet.py
index 606defa..3b726ea 100644
--- libcloud/compute/drivers/vpsnet.py
+++ libcloud/compute/drivers/vpsnet.py
@@ -82,6 +82,7 @@ class VPSNetNodeDriver(NodeDriver):
     type = Provider.VPSNET
     api_name = 'vps_net'
     name = "vps.net"
+    website = 'http://vps.net/'
     connectionCls = VPSNetConnection
 
     def _to_node(self, vm):