diff --git a/feeds.info b/feeds.info
index 2ab71dc0228589d3ebc8ae17005540ee877dc9fc..1d5590f84fc1a2aaaeda58ea851c493d5dd133f5 100644
--- a/feeds.info
+++ b/feeds.info
@@ -41,6 +41,7 @@ files[] = tests/feeds_mapper_profile.test
 files[] = tests/feeds_mapper.test
 files[] = tests/feeds_mapper_config.test
 files[] = tests/feeds_fetcher_file.test
+files[] = tests/feeds_fetcher_http.test
 files[] = tests/feeds_processor_entity.test
 files[] = tests/feeds_processor_node.test
 files[] = tests/feeds_processor_term.test
diff --git a/plugins/FeedsHTTPFetcher.inc b/plugins/FeedsHTTPFetcher.inc
index 4e7afc7443162c07f1b27deadaae3e78d5b46b48..3bd0c1e4c7836952e0b037f68b19a8992be8bd42 100644
--- a/plugins/FeedsHTTPFetcher.inc
+++ b/plugins/FeedsHTTPFetcher.inc
@@ -108,6 +108,7 @@ class FeedsHTTPFetcher extends FeedsFetcher {
       'use_pubsubhubbub' => FALSE,
       'designated_hub' => '',
       'request_timeout' => NULL,
+      'auto_scheme' => 'http',
     );
   }
 
@@ -128,27 +129,40 @@ class FeedsHTTPFetcher extends FeedsFetcher {
       '#description' => t('Attempt to use a <a href="http://en.wikipedia.org/wiki/PubSubHubbub">PubSubHubbub</a> subscription if available.'),
       '#default_value' => $this->config['use_pubsubhubbub'],
     );
-    $form['designated_hub'] = array(
+    $form['advanced'] = array(
+      '#title' => t('Advanced settings'),
+      '#type' => 'fieldset',
+      '#collapsible' => TRUE,
+      '#collapsed' => TRUE,
+    );
+    $form['advanced']['auto_scheme'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Automatically add scheme'),
+      '#description' => t('If the supplied URL does not contain the scheme, use this one automatically. Keep empty to force the user to input the scheme.'),
+      '#default_value' => $this->config['auto_scheme'],
+    );
+    $form['advanced']['designated_hub'] = array(
       '#type' => 'textfield',
       '#title' => t('Designated hub'),
       '#description' => t('Enter the URL of a designated PubSubHubbub hub (e. g. superfeedr.com). If given, this hub will be used instead of the hub specified in the actual feed.'),
       '#default_value' => $this->config['designated_hub'],
-      '#dependency' => array(
-        'edit-use-pubsubhubbub' => array(1),
+      '#states' => array(
+        'visible' => array(':input[name="use_pubsubhubbub"]' => array('checked' => TRUE)),
       ),
     );
-   // Per importer override of global http request timeout setting.
-   $form['request_timeout'] = array(
-     '#type' => 'textfield',
-     '#title' => t('Request timeout'),
-     '#description' => t('Timeout in seconds to wait for an HTTP get request to finish.</br>' .
+    // Per importer override of global http request timeout setting.
+    $form['advanced']['request_timeout'] = array(
+      '#type' => 'textfield',
+      '#title' => t('Request timeout'),
+      '#description' => t('Timeout in seconds to wait for an HTTP get request to finish.</br>' .
                          '<b>Note:</b> this setting will override the global setting.</br>' .
                          'When left empty, the global value is used.'),
-     '#default_value' => $this->config['request_timeout'],
-     '#element_validate' => array('element_validate_integer_positive'),
-     '#maxlength' => 3,
-     '#size'=> 30,
-   );
+      '#default_value' => $this->config['request_timeout'],
+      '#element_validate' => array('element_validate_integer_positive'),
+      '#maxlength' => 3,
+      '#size'=> 30,
+    );
+
     return $form;
   }
 
@@ -174,9 +188,17 @@ class FeedsHTTPFetcher extends FeedsFetcher {
   public function sourceFormValidate(&$values) {
     $values['source'] = trim($values['source']);
 
+    // Keep a copy for error messages.
+    $original_url = $values['source'];
+
+    $parts = parse_url($values['source']);
+    if (empty($parts['scheme']) && $this->config['auto_scheme']) {
+      $values['source'] = $this->config['auto_scheme'] . '://' . $values['source'];
+    }
+
     if (!feeds_valid_url($values['source'], TRUE)) {
       $form_key = 'feeds][' . get_class($this) . '][source';
-      form_set_error($form_key, t('The URL %source is invalid.', array('%source' => $values['source'])));
+      form_set_error($form_key, t('The URL %source is invalid.', array('%source' => $original_url)));
     }
     elseif ($this->config['auto_detect_feeds']) {
       feeds_include_library('http_request.inc', 'http_request');
diff --git a/tests/feeds_fetcher_http.test b/tests/feeds_fetcher_http.test
new file mode 100644
index 0000000000000000000000000000000000000000..305ebf461fc2d55f6b96239cfa83e482bdfdc601
--- /dev/null
+++ b/tests/feeds_fetcher_http.test
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * @file
+ * Contains FeedsFileHTTPTestCase.
+ */
+
+/**
+ * HTTP fetcher test class.
+ */
+class FeedsFileHTTPTestCase extends FeedsWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Fetcher: HTTP',
+      'description' => 'Tests for file http fetcher plugin.',
+      'group' => 'Feeds',
+    );
+  }
+
+  /**
+   * Test the Feed URL form.
+   */
+  public function testFormValidation() {
+    // Set up an importer.
+    $id = drupal_strtolower($this->randomName());
+    $this->createImporterConfiguration($this->randomString(), $id);
+
+    // Check that by default, we add http:// to the front of the URL.
+    $edit = array(
+      'feeds[FeedsHTTPFetcher][source]' => 'example.com',
+    );
+    $this->drupalPost('import/' . $id, $edit, t('Import'));
+    $this->assertText(t('There are no new nodes.'));
+    $this->assertFieldByName('feeds[FeedsHTTPFetcher][source]', 'http://example.com');
+
+    $this->setSettings($id, 'FeedsHTTPFetcher', array('auto_scheme' => 'feed'));
+    $this->drupalPost('import/' . $id, $edit, t('Import'));
+    $this->assertText(t('There are no new nodes.'));
+    $this->assertFieldByName('feeds[FeedsHTTPFetcher][source]', 'feed://example.com');
+
+    $this->setSettings($id, 'FeedsHTTPFetcher', array('auto_scheme' => ''));
+    $this->drupalPost('import/' . $id, $edit, t('Import'));
+    $this->assertText(t('The URL example.com is invalid.'));
+    $this->assertFieldByName('feeds[FeedsHTTPFetcher][source]', 'example.com');
+  }
+
+}