diff --git a/src/noosfero-spb/software_communities/features/public_software_validation.feature b/src/noosfero-spb/software_communities/features/public_software_validation.feature
index 6f26b1d..144db8f 100644
--- a/src/noosfero-spb/software_communities/features/public_software_validation.feature
+++ b/src/noosfero-spb/software_communities/features/public_software_validation.feature
@@ -22,13 +22,13 @@ Feature: edit adherent fields
     Given I am logged in as "joaosilva"
     And I go to /myprofile/basic-software/plugin/software_communities/edit_software
     And I follow "Specifications"
-    Then I should see "Public software" within ".public_software_disabled"
+    Then the "Public Software" checkbox within "software_public_software" should not be checked
 
   Scenario: Enable public software checkbox to admin users
     Given I am logged in as mpog_admin
     And I go to /myprofile/basic-software/plugin/software_communities/edit_software
     And I follow "Specifications"
-    Then I should see "Public software" within ".public_software_enabled"
+    Then the "Public Software" checkbox within "software_public_software" should be checked
 
   @selenium
   Scenario: Show adherent fields when checkbox are checked
diff --git a/src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb b/src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb
index de191e4..179587b 100644
--- a/src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb
+++ b/src/noosfero-spb/software_communities/features/step_definitions/software_communities_steps.rb
@@ -84,8 +84,10 @@ end
 
 Given /^the following softwares$/ do |table|
   table.hashes.each do |item|
+    software = Software.new(:name => item[:name], :identifier => item[:name].to_slug)
+
     software_info = SoftwareInfo.new
-    software_info.community = Community.create(:name=>item[:name])
+    software_info.software = software
 
     software_info.finality = item[:finality] if item[:finality]
     software_info.acronym = item[:acronym] if item[:acronym]
@@ -121,11 +123,12 @@ Given /^the following softwares$/ do |table|
 
       categories.each do |category_name|
         category = Category.find_by_name category_name
-        software_info.community.categories << category
+        software_info.software.categories << category
       end
     end
 
-    software_info.save!
+    software.software_info = software_info
+    software.save!
   end
 end
 
diff --git a/src/noosfero-spb/software_communities/lib/software.rb b/src/noosfero-spb/software_communities/lib/software.rb
index 525bfce..237d5e7 100644
--- a/src/noosfero-spb/software_communities/lib/software.rb
+++ b/src/noosfero-spb/software_communities/lib/software.rb
@@ -26,4 +26,9 @@ class Software < Organization
     self.hits += 1
     self.save!
   end
+
+  def software?
+    true
+  end
+
 end
diff --git a/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake b/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake
index 4627754..85d307c 100644
--- a/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake
+++ b/src/noosfero-spb/software_communities/lib/tasks/create_sample_softwares.rake
@@ -47,12 +47,11 @@ end
 def create_software(name)
   software = Software.new
   software.name = name
-  software.save
   software
 end
 
 def create_software_info(name, acronym = "", finality = "default")
-  community = create_software(name)
+  software = create_software(name)
   software_info = SoftwareInfo.new
   software_info.software = software
   software_info.public_software = true
@@ -60,10 +59,11 @@ def create_software_info(name, acronym = "", finality = "default")
   software_info.finality = finality
   software_info.license_info = LicenseInfo.first
 
-  if software_info.softare.valid? && software_info.valid?
+  software.software_info = software_info
+
+  if software_info.software.valid? && software_info.valid?
     print "."
-    software_info.save
-    software_info
+    software.save
   else
     print "F"
     nil
diff --git a/src/noosfero-spb/software_communities/views/blocks/download.html.erb b/src/noosfero-spb/software_communities/views/blocks/download.html.erb
index ffab889..0bb2aa6 100644
--- a/src/noosfero-spb/software_communities/views/blocks/download.html.erb
+++ b/src/noosfero-spb/software_communities/views/blocks/download.html.erb
@@ -1,7 +1,7 @@
 <% if block.owner.software_info.nil? %>
   <%= _("This community needs a software to use this block") %>
 <% else %>
-    <h3 class="block-title"> <%= _("Download #{block.owner.software_info.community.name}") %> </h3>
+    <h3 class="block-title"> <%= _("Download #{block.owner.software_info.software.name}") %> </h3>
     <ul class="download-list">
     <% block.downloads.each_with_index do |download, index| %>
       <li id="download-item-<%=(index+1)%>">
--
libgit2 0.21.2