diff --git a/setup.py b/setup.py
index 1f2c445..984b8db 100755
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-import configparser, os.path, sqlite3, tweepy
+import configparser, os.path, tweepy, dbtools, getpass
 
 if os.path.isfile("config.cfg"):
  print("config.cfg already exists. Please remove it before running this script.")
@@ -10,26 +10,49 @@ config = configparser.RawConfigParser()
 
 config.add_section('Database')
 
-print('''Twitools will use a database for certain tasks. If this file does not exist yet,
-it will be created in this process. The file name defaults to 'Database.db'.
+print('''Twitools will use a database for certain tasks. You can use a file or a MySQL database for this purpose. 
+
+If you wish to use a MySQL database, you will need the credentials for it. If you don't know what any of that means, stick with the default value and just press Enter.
 ''')
 
-dbpath = input("Name of the database file [Database.db]: ")
+dbtype = input("Database type: %i (file), %i (MySQL) [%i]: " % (dbtools.SQLITE, dbtools.MYSQL, dbtools.SQLITE))
 print()
 
-if dbpath == "":
- dbpath = "Database.db"
-
-config.set('Database', 'path', dbpath)
-
-if os.path.isfile(dbpath):
+try:
+ dbtype = int(dbtype)
+except:
  pass
-else: 
- conn = sqlite3.connect(dbpath)
- cur = conn.cursor()
- cur.execute("CREATE TABLE tweets(`tweet_id` INTEGER NOT NULL, `in_reply_to_status_id` TEXT, `in_reply_to_user_id` TEXT, `timestamp` TEXT, `source` TEXT, `text` TEXT, `retweeted_status_id` TEXT, `retweeted_status_user_id` TEXT, `retweeted_status_timestamp` TEXT, `expanded_urls` TEXT, PRIMARY KEY(tweet_id));")
- conn.commit()
- conn.close()
+
+if dbtype == dbtools.MYSQL:
+ dbhost = input("MySQL host [localhost]: ") or "localhost"
+ dbuser = input("MySQL username [twitools]: ") or "twitools"
+ dbpass = getpass.getpass("MySQL password (not echoed!): ")
+ dbname = input("MySQL database name [twitools]: ") or "twitools"
+ print()
+
+ config.set('Database', 'type', dbtype)
+ config.set('Database', 'host', dbhost)
+ config.set('Database', 'user', dbuser)
+ config.set('Database', 'pass', dbpass)
+ config.set('Database', 'name', dbname)
+
+else:
+ dbtype = dbtools.SQLITE
+ dbpath = input("Name of the database file [Database.db]: ") or "Database.db"
+ print()
+
+ config.set('Database', 'type', dbtype)
+ config.set('Database', 'path', dbpath)
+
+if dbtype == dbtools.MYSQL:
+ db = dbtools.dbObject(dbtype=dbtype, host=dbhost, user=dbuser, pwd=dbpass, db=dbname)
+else:
+ db = dbtools.dbObject(dbtype=dbtype, path=dbpath)
+if not db.isInitialized():
+ db.executeQuery("CREATE TABLE tweets(`tweet_id` INTEGER NOT NULL, `in_reply_to_status_id` TEXT, `in_reply_to_user_id` TEXT, `timestamp` TEXT, `source` TEXT, `text` TEXT, `retweeted_status_id` TEXT, `retweeted_status_user_id` TEXT, `retweeted_status_timestamp` TEXT, `expanded_urls` TEXT, PRIMARY KEY(tweet_id));")
+ db.commit()
+
+db.closeConnection()
 
 config.add_section("Twitter")