diff --git a/lib/ext/search_controller.rb b/lib/ext/search_controller.rb
index 25ef97f..a7ea144 100644
--- a/lib/ext/search_controller.rb
+++ b/lib/ext/search_controller.rb
@@ -80,7 +80,7 @@ class SearchController
   def get_communities_list software_list
     filtered_community_list = []
       software_list.each do |software|
-       if @include_non_public || software.public_software?
+       if @all_selected || software.public_software?
          filtered_community_list << software.community unless software.community.nil?
        end
     end
@@ -110,7 +110,8 @@ class SearchController
     @selected_categories_id = params[:selected_categories_id]
     @selected_categories_id ||= []
     @selected_categories_id = @selected_categories_id.map(&:to_i)
-    @include_non_public = params[:include_non_public] == "true"
+    @all_selected = params[:software_type] == "all"
+    @public_software_selected = !@all_selected
     @per_page = prepare_per_page
   end
 
diff --git a/public/views/search-software-catalog.js b/public/views/search-software-catalog.js
index 09dc7ce..552b055 100644
--- a/public/views/search-software-catalog.js
+++ b/public/views/search-software-catalog.js
@@ -39,7 +39,11 @@ modulejs.define('SearchSoftwareCatalog', ['jquery', 'NoosferoRoot', 'SoftwareCat
     params.software_display = $("#software_display").val();
     params.sort = $("#sort").val();
 
-    params.include_non_public = $("#include_non_public").is(":checked");
+    if($("#all_radio_button").is(":checked")) {
+      params.software_type = $("#all_radio_button").val();
+    } else {
+      params.software_type = $("#public_software_radio_button").val();
+    }
 
     return params;
   }
diff --git a/views/search/_catalog_filter.html.erb b/views/search/_catalog_filter.html.erb
index 0349f40..e6a9dd7 100644
--- a/views/search/_catalog_filter.html.erb
+++ b/views/search/_catalog_filter.html.erb
@@ -12,14 +12,6 @@
         <% end %>
       </ul>
     </div>
-
-    <div class="project-software"> <%= _("Software Projects:") %>
-      <label>
-        <%= check_box_tag("include_non_public", true, @include_non_public) %>
-        <%= _("Include in results") %>
-      </label>
-      <span class="doubts-catalog-software" title="<%= _('Include software development projects that are not yet officially Brazilian Public Software.') %>">?</span>
-    </div>
   </div>
   <div id="filter-option-catalog-software"><%= _("More options") %></div>
   <div id="filter-option-catalog-close">
diff --git a/views/search/_software_search_form.html.erb b/views/search/_software_search_form.html.erb
index 126f646..7e547d7 100644
--- a/views/search/_software_search_form.html.erb
+++ b/views/search/_software_search_form.html.erb
@@ -5,19 +5,22 @@
     <%= form_tag( { :controller => 'search', :action => @asset ? @asset : 'index', :asset => nil, :category_path => ( @category ? @category.path : nil ) },
       :method => 'get') do %>
 
-    <div style="margin:0;padding:0;display:inline">
-      <input name="utf8" type="hidden" value="&#x2713;" />
-    </div>
-    <%= hidden_field_tag :display, params[:display] %>
-    <%= hidden_field_tag :filter, params[:filter] %>
+      <div style="margin:0;padding:0;display:inline">
+      <input name="utf8" type="hidden" value="&#x2713;" /></div>
+
+      <%= hidden_field_tag :display, params[:display] %>
+      <%= hidden_field_tag :filter, params[:filter] %>
+
+      <%= labelled_radio_button _('Public Software'), :software_type, 'public_software', @public_software_selected, :id => "public_software_radio_button", :class => "project-software" %>
+      <%= labelled_radio_button _('All'), :software_type, 'all', @all_selected, :id => "all_radio_button", :class => "project-software" %>
 
-    <div class="search-field">
-      <span class="formfield">
-        <%= text_field_tag 'query', @query, :id => 'search-input', :size => 50, :placeholder=>_("Type words about the software you're looking for (the search begins after 3 characters)") %>
-      </span>
+      <div class="search-field">
+        <span class="formfield">
+          <%= text_field_tag 'query', @query, :id => 'search-input', :size => 50, :placeholder=>_("Type words about the software you're looking for (the search begins after 3 characters)") %>
+        </span>
 
       <%= submit_button(:search, _('Filter')) %>
-    </div>
+      </div>
     <%= render :partial => 'search_form_extra_fields' %>
     <%= render :partial => 'catalog_filter' %>
     <% end %>
--
libgit2 0.21.2