diff --git a/app/controllers/spree/admin/products_controller.rb b/app/controllers/spree/admin/products_controller.rb
new file mode 100644
index 0000000000..59f2aae4d0
--- /dev/null
+++ b/app/controllers/spree/admin/products_controller.rb
@@ -0,0 +1,121 @@
+module Spree
+  module Admin
+    class ProductsController < ResourceController
+      helper 'spree/products'
+
+      before_filter :load_data, :except => :index
+      create.before :create_before
+      update.before :update_before
+
+      def show
+        session[:return_to] ||= request.referer
+        redirect_to( :action => :edit )
+      end
+
+      def index
+        session[:return_to] = request.url
+        respond_with(@collection)
+      end
+
+      def update
+        if params[:product][:taxon_ids].present?
+          params[:product][:taxon_ids] = params[:product][:taxon_ids].split(',')
+        end
+        if params[:product][:option_type_ids].present?
+          params[:product][:option_type_ids] = params[:product][:option_type_ids].split(',')
+        end
+        super
+      end
+
+      def destroy
+        @product = Product.find_by_permalink!(params[:id])
+        @product.destroy
+
+        flash[:success] = Spree.t('notice_messages.product_deleted')
+
+        respond_with(@product) do |format|
+          format.html { redirect_to collection_url }
+          format.js  { render_js_for_destroy }
+        end
+      end
+
+      def clone
+        @new = @product.duplicate
+
+        if @new.save
+          flash[:success] = Spree.t('notice_messages.product_cloned')
+        else
+          flash[:success] = Spree.t('notice_messages.product_not_cloned')
+        end
+
+        redirect_to edit_admin_product_url(@new)
+      end
+
+      def stock
+        @variants = @product.variants
+        @variants = [@product.master] if @variants.empty?
+        @stock_locations = StockLocation.accessible_by(current_ability, :read)
+        if @stock_locations.empty?
+          flash[:error] = Spree.t(:stock_management_requires_a_stock_location)
+          redirect_to admin_stock_locations_path
+        end
+      end
+
+      protected
+
+        def find_resource
+          Product.find_by_permalink!(params[:id])
+        end
+
+        def location_after_save
+          spree.edit_admin_product_url(@product)
+        end
+
+        def load_data
+          @taxons = Taxon.order(:name)
+          @option_types = OptionType.order(:name)
+          @tax_categories = TaxCategory.order(:name)
+          @shipping_categories = ShippingCategory.order(:name)
+        end
+
+        def collection
+          return @collection if @collection.present?
+          params[:q] ||= {}
+          params[:q][:deleted_at_null] ||= "1"
+
+          params[:q][:s] ||= "name asc"
+          @collection = super
+          @collection = @collection.with_deleted if params[:q].delete(:deleted_at_null).blank?
+          # @search needs to be defined as this is passed to search_form_for
+          @search = @collection.ransack(params[:q])
+          @collection = @search.result.
+            group_by_products_id.
+            includes(product_includes).
+            page(params[:page]).
+            per(Spree::Config[:admin_products_per_page])
+
+          if params[:q][:s].include?("master_default_price_amount")
+            # PostgreSQL compatibility
+            @collection = @collection.group("spree_prices.amount")
+          end
+          @collection
+        end
+
+        def create_before
+          return if params[:product][:prototype_id].blank?
+          @prototype = Spree::Prototype.find(params[:product][:prototype_id])
+        end
+
+        def update_before
+          # note: we only reset the product properties if we're receiving a post from the form on that tab
+          return unless params[:clear_product_properties]
+          params[:product] ||= {}
+        end
+
+        def product_includes
+         [{:variants => [:images, {:option_values => :option_type}]}, {:master => [:images, :default_price]}]
+        end
+
+    end
+  end
+end