diff --git a/.bzrignore b/.bzrignore
deleted file mode 100644
index bba5eda..0000000
--- a/.bzrignore
+++ /dev/null
@@ -1,52 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-./config/config.h
-./config/ltmain.sh
-./config/stamp-h1
-./doc/manual.html
-./config.log
-./config.status
-./configure
-./libtool
-./doc/xsl/catalog.xml
-./sysbench/.deps
-./sysbench/.libs
-./sysbench/sysbench
-./sysbench/drivers/mysql/.deps
-./sysbench/drivers/oracle/.deps
-./sysbench/drivers/pgsql/.deps
-./sysbench/tests/cpu/.deps
-./sysbench/tests/fileio/.deps
-./sysbench/tests/memory/.deps
-./sysbench/tests/mutex/.deps
-./sysbench/tests/oltp/.deps
-./sysbench/tests/threads/.deps
-./TAGS
-./backup.bzr
-./config/config.guess
-./config/config.h.in
-./config/config.sub
-./sysbench/TAGS
-./sysbench/drivers/TAGS
-./sysbench/drivers/mysql/TAGS
-./sysbench/tests/TAGS
-./sysbench/tests/cpu/TAGS
-./sysbench/tests/fileio/TAGS
-./sysbench/tests/memory/TAGS
-./sysbench/tests/mutex/TAGS
-./sysbench/tests/oltp/TAGS
-./sysbench/tests/threads/TAGS
-./config/compile
-./config/depcomp
-./config/install-sh
-./config/missing
-./m4/libtool.m4
-./m4/ltoptions.m4
-./m4/ltsugar.m4
-./m4/ltversion.m4
-./m4/lt~obsolete.m4
-./sysbench/drivers/drizzle/.deps
-./sysbench/scripting/.deps
-./sysbench/scripting/lua/src/.deps
diff --git a/.gitignore b/.gitignore
index dc469a0..265ff40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,59 @@
-/sysbench/GPATH
-/sysbench/GRTAGS
-/sysbench/GTAGS
+*.o
+*.a
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+/config/config.h
+/config/ltmain.sh
+/config/stamp-h1
+/doc/manual.html
+/config.log
+/config.status
+/configure
+/libtool
+/doc/xsl/catalog.xml
+/sysbench/.deps
+/sysbench/.libs
+/sysbench/sysbench
+/sysbench/drivers/mysql/.deps
+/sysbench/drivers/oracle/.deps
+/sysbench/drivers/pgsql/.deps
+/sysbench/tests/cpu/.deps
+/sysbench/tests/fileio/.deps
+/sysbench/tests/memory/.deps
+/sysbench/tests/mutex/.deps
+/sysbench/tests/oltp/.deps
+/sysbench/tests/threads/.deps
+/TAGS
+/backup.bzr
+/config/config.guess
+/config/config.h.in
+/config/config.sub
+/sysbench/TAGS
+/sysbench/drivers/TAGS
+/sysbench/drivers/mysql/TAGS
+/sysbench/tests/TAGS
+/sysbench/tests/cpu/TAGS
+/sysbench/tests/fileio/TAGS
+/sysbench/tests/memory/TAGS
+/sysbench/tests/mutex/TAGS
+/sysbench/tests/oltp/TAGS
+/sysbench/tests/threads/TAGS
+/config/compile
+/config/depcomp
+/config/install-sh
+/config/missing
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+/sysbench/drivers/drizzle/.deps
+/sysbench/scripting/.deps
+/sysbench/scripting/lua/src/.deps
+GPATH
+GRTAGS
+GTAGS
+/config/ar-lib
+/sysbench/drivers/attachsql/.deps/