diff --git a/config-templates/authsources.php b/config-templates/authsources.php
index 9efcc665a5041f81a991763592c693e6c513d4a8..a1ffb94c2f59546fd555c54324601d8bf2ce3dcf 100644
--- a/config-templates/authsources.php
+++ b/config-templates/authsources.php
@@ -92,6 +92,24 @@ $config = array(
 	),
 	*/
 
+	/*
+	// Example of an authsource that authenticates against Google.
+	// See: http://code.google.com/apis/accounts/docs/OpenID.html
+	'google' => array(
+		'openid:OpenIDConsumer',
+		// Googles OpenID endpoint.
+		'target' => 'https://www.google.com/accounts/o8/id',
+		// Attributes that google can supply.
+		'attributes.ax_required' => array(
+			//'http://axschema.org/namePerson/first',
+			//'http://axschema.org/namePerson/last',
+			//'http://axschema.org/contact/email',
+			//'http://axschema.org/contact/country/home',
+			//'http://axschema.org/pref/language',
+		),
+	),
+	*/
+
 	/*
 	'papi' => array(
 		'authpapi:PAPI',
diff --git a/modules/openid/lib/Auth/Source/OpenIDConsumer.php b/modules/openid/lib/Auth/Source/OpenIDConsumer.php
index da8fd184cb077f3301f87b19f86561288cba935c..a28fddd867637b239acae5ffbf3c49fc57bac68a 100644
--- a/modules/openid/lib/Auth/Source/OpenIDConsumer.php
+++ b/modules/openid/lib/Auth/Source/OpenIDConsumer.php
@@ -24,6 +24,14 @@ require_once('Auth/OpenID/ServerRequest.php');
  */
 class sspmod_openid_Auth_Source_OpenIDConsumer extends SimpleSAML_Auth_Source {
 
+	/**
+	 * Static openid target to use.
+	 *
+	 * @var string|NULL
+	 */
+	private $target;
+
+
 	/**
 	 * List of optional attributes.
 	 */
@@ -56,6 +64,8 @@ class sspmod_openid_Auth_Source_OpenIDConsumer extends SimpleSAML_Auth_Source {
 		$cfgParse = SimpleSAML_Configuration::loadFromArray($config,
 			'Authentication source ' . var_export($this->authId, TRUE));
 
+		$this->target = $cfgParse->getString('target', NULL);
+
 		$this->optionalAttributes = $cfgParse->getArray('attributes.optional', array());
 		$this->requiredAttributes = $cfgParse->getArray('attributes.required', array());
 
@@ -76,6 +86,11 @@ class sspmod_openid_Auth_Source_OpenIDConsumer extends SimpleSAML_Auth_Source {
 		assert('is_array($state)');
 
 		$state['openid:AuthId'] = $this->authId;
+
+		if ($this->target !== NULL) {
+			$this->doAuth($state, $this->target);
+		}
+
 		$id = SimpleSAML_Auth_State::saveState($state, 'openid:state');
 
 		$url = SimpleSAML_Module::getModuleURL('openid/consumer.php');