diff --git a/.gitignore b/.gitignore
index 92f8cfdf..67774069 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,10 @@ pkg
 doc
 *.log
 *.db
+*.sqlite3
 .DS_Store
 *~
 .autotest
-tmp
-log
+log/[^.]*
+tmp/**/*
 database.yml
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 00000000..a43c8f5f
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,14 @@
+# This file is auto-generated from the current state of the database. Instead of editing this file, 
+# please use the migrations feature of ActiveRecord to incrementally modify your database, and
+# then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your database schema. If you need
+# to create the application database on another system, you should be using db:schema:load, not running
+# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 0) do
+
+end
diff --git a/log/.gitignore b/log/.gitignore
new file mode 100644
index 00000000..e69de29b
diff --git a/tmp/.gitignore b/tmp/.gitignore
new file mode 100644
index 00000000..e69de29b