diff --git a/src/noosfero-spb/software_communities/lib/ext/person.rb b/src/noosfero-spb/software_communities/lib/ext/person.rb
index 2ccb9a2..b08a9f3 100644
--- a/src/noosfero-spb/software_communities/lib/ext/person.rb
+++ b/src/noosfero-spb/software_communities/lib/ext/person.rb
@@ -10,15 +10,19 @@ class Person
     false
   end
 
-  def softwares
-    softwares = []
-    self.communities.each do |community|
-      if community.software?
-        softwares << community
-      end
-    end
+  #def softwares
+  #  softwares = []
+  #  self.communities.each do |community|
+  #    if community.software?
+  #      softwares << community
+  #    end
+  #  end
+  #
+  #  softwares
+  # end
 
-    softwares
+  def softwares
+    memberships.softwares
   end
 
 end
diff --git a/src/noosfero-spb/software_communities/lib/software.rb b/src/noosfero-spb/software_communities/lib/software.rb
index 9151304..3370e6d 100644
--- a/src/noosfero-spb/software_communities/lib/software.rb
+++ b/src/noosfero-spb/software_communities/lib/software.rb
@@ -1,4 +1,4 @@
-class Software < Community
+class Software < Organization
   has_one :software_info
   validates_presence_of :software_info
   attr_accessible :software_info
diff --git a/src/noosfero-spb/software_communities/lib/software_info.rb b/src/noosfero-spb/software_communities/lib/software_info.rb
index a4f7651..9136a2b 100644
--- a/src/noosfero-spb/software_communities/lib/software_info.rb
+++ b/src/noosfero-spb/software_communities/lib/software_info.rb
@@ -119,14 +119,6 @@ class SoftwareInfo < ActiveRecord::Base
     }
   }
 
-  def community
-    return self.software
-  end
-
-  def community= community
-    self.software = community.becomes(Software) if community
-  end
-
   def license_info
     license = LicenseInfo.find_by_id self.license_info_id
     license_another = LicenseInfo.find_by_version("Another")
--
libgit2 0.21.2