diff --git a/lib/feed_handler.rb b/lib/feed_handler.rb
index 103f364..dfb0c01 100644
--- a/lib/feed_handler.rb
+++ b/lib/feed_handler.rb
@@ -43,7 +43,11 @@ class FeedHandler
             raise InvalidUrl.new("\"%s\" is not a valid URL" % address)
           end
           header = {"User-Agent" => "Noosfero/#{Noosfero::VERSION}"}
-          header.merge!(:proxy => ENV['FEED_HTTP_PROXY']) if ENV['FEED_HTTP_PROXY']
+          if address.starts_with?("https://")
+            header.merge!(:proxy => ENV['FEED_HTTPS_PROXY']) if ENV['FEED_HTTPS_PROXY']
+          else
+            header.merge!(:proxy => ENV['FEED_HTTP_PROXY']) if ENV['FEED_HTTP_PROXY']
+          end
           open(address, header, &block)
         end
       return content
diff --git a/test/unit/feed_handler_test.rb b/test/unit/feed_handler_test.rb
index 969ada0..83dad82 100644
--- a/test/unit/feed_handler_test.rb
+++ b/test/unit/feed_handler_test.rb
@@ -147,4 +147,24 @@ class FeedHandlerTest < ActiveSupport::TestCase
     assert_equal 'bli content', handler.fetch('http://site.org/feed.xml')
   end
 
+  should 'set proxy when FEED_HTTPS_PROXY is setted from env' do
+    ENV.stubs('[]').with('FEED_HTTPS_PROXY').returns('http://127.0.0.1:3128')
+    handler.expects(:open).with('https://site.org/feed.xml', {"User-Agent" => "Noosfero/#{Noosfero::VERSION}", :proxy => 'http://127.0.0.1:3128'}, anything).returns('bli content')
+    assert_equal 'bli content', handler.fetch('https://site.org/feed.xml')
+  end
+
+  should 'use https proxy for https address when both env variables were defined' do
+    ENV.stubs('[]').with('FEED_HTTPS_PROXY').returns('http://127.0.0.2:3128')
+    ENV.stubs('[]').with('FEED_HTTP_PROXY').returns('http://127.0.0.1:3128')
+    handler.expects(:open).with('https://site.org/feed.xml', {"User-Agent" => "Noosfero/#{Noosfero::VERSION}", :proxy => 'http://127.0.0.2:3128'}, anything).returns('bli content')
+    assert_equal 'bli content', handler.fetch('https://site.org/feed.xml')
+  end
+
+  should 'use http proxy for http address when both env variables were defined' do
+    ENV.stubs('[]').with('FEED_HTTPS_PROXY').returns('http://127.0.0.2:3128')
+    ENV.stubs('[]').with('FEED_HTTP_PROXY').returns('http://127.0.0.1:3128')
+    handler.expects(:open).with('http://site.org/feed.xml', {"User-Agent" => "Noosfero/#{Noosfero::VERSION}", :proxy => 'http://127.0.0.1:3128'}, anything).returns('bli content')
+    assert_equal 'bli content', handler.fetch('http://site.org/feed.xml')
+  end
+
 end
--
libgit2 0.21.2