diff --git a/app/models/package.rb b/app/models/package.rb
index 3635195ee..f64f0bb3b 100644
--- a/app/models/package.rb
+++ b/app/models/package.rb
@@ -35,6 +35,21 @@ class Package < ApplicationModel
     return package.to_s
   end
 
+  def self.auto_install
+    path = @@root + '/auto_install/'
+    return if ! File.exist?( path )
+    data = []
+    Dir.foreach( path ) do |entry|
+      if entry =~ /\.zpm/
+        data.push entry
+      end
+    end
+    data.each {|file|
+      self.install( :file => path + '/' + file )
+    }
+    return data
+  end
+
   def self.install(data)
     if data[:file]
       xml     = self._read_file( data[:file], true )
diff --git a/test/unit/package_test.rb b/test/unit/package_test.rb
index 85abebbd9..94282959b 100644
--- a/test/unit/package_test.rb
+++ b/test/unit/package_test.rb
@@ -155,6 +155,75 @@ X3RhYmxlIDpzYW1wbGVfdGFibGVzDQogIGVuZA0KZW5k</file>
         },
       },
 
+      # test 5
+      {
+        :zpm => '<?xml version="1.0"?>
+<zpm version="1.0">
+  <name>UnitTestSample</name>
+  <version>1.0.2</version>
+  <vendor>Znuny GmbH</vendor>
+  <url>http://znuny.org/</url>
+  <license>ABC</license>
+  <description lang="en">some description</description>
+  <filelist>
+    <file permission="644" location="test.txt2">YWJjw6TDtsO8w58=</file>
+    <file permission="644" location="some/dir/test.txt2">YWJjw6TDtsO8w58=</file>
+    <file permission="644" location="db/addon/unit_test_sample/20121212000001_create_base.rb">Y2xhc3MgQ3JlYXRlQmFzZSA8IEFjdGl2ZVJlY29yZDo6TWlncmF0aW9uDQogIGRlZiBzZWxmLnVw
+DQogICBjcmVhdGVfdGFibGUgOnNhbXBsZV90YWJsZXMgZG8gfHR8DQogICAgICB0LmNvbHVtbiA6
+bmFtZSwgICAgICAgICAgIDpzdHJpbmcsIDpsaW1pdCA9PiAxNTAsICA6bnVsbCA9PiB0cnVlDQog
+ICAgICB0LmNvbHVtbiA6ZGF0YSwgICAgICAgICAgIDpzdHJpbmcsIDpsaW1pdCA9PiA1MDAwLCA6
+bnVsbCA9PiB0cnVlDQogICAgZW5kDQogIGVuZA0KDQogIGRlZiBzZWxmLmRvd24NCiAgICBkcm9w
+X3RhYmxlIDpzYW1wbGVfdGFibGVzDQogIGVuZA0KZW5k</file>
+  </filelist>
+</zpm>',
+        :action => 'auto_install',
+        :result => true,
+        :verify => {
+          :package => {
+            :name    => 'UnitTestSample',
+            :version => '1.0.2',
+          },
+          :check_files => [
+            {
+              :location => 'test.txt2',
+              :result   => true,
+            },
+            {
+              :location => 'test.txt',
+              :result   => false,
+            },
+            {
+              :location => 'test2.txt',
+              :result   => false,
+            },
+            {
+              :location => 'some/dir/test.txt2',
+              :result   => true,
+            },
+          ],
+        },
+      },
+
+      # test 6
+      {
+        :name     => 'UnitTestSample',
+        :version  => '1.0.2',
+        :action   => 'uninstall',
+        :result   => true,
+        :verify   => {
+          :check_files => [
+            {
+              :location => 'test.txt',
+              :result   => false,
+            },
+            {
+              :location => 'test2.txt',
+              :result   => false,
+            },
+          ],
+        },
+      },
+
     ]
     tests.each { |test|
       if test[:action] == 'install'
@@ -188,6 +257,24 @@ X3RhYmxlIDpzYW1wbGVfdGFibGVzDQogIGVuZA0KZW5k</file>
         else
           assert( !success, "uninstall package successful but should not" )
         end
+      elsif test[:action] == 'auto_install'
+        if test[:zpm]
+          if !File.exist?( Rails.root.to_s + '/auto_install/' )
+            Dir.mkdir( Rails.root.to_s + '/auto_install/', 0755)
+          end
+          location = Rails.root.to_s + '/auto_install/unittest.zpm'
+          file = File.new( location, 'wb' )
+          file.write( test[:zpm] ) 
+          file.close
+        end
+        begin
+          success = Package.auto_install()
+        rescue
+          success = false
+        end
+        if test[:zpm]
+          File.delete( location )
+        end
       end
       if test[:verify] && test[:verify][:package]
         exists = Package.where( :name => test[:verify][:package][:name], :version => test[:verify][:package][:version] ).first