diff --git a/salt/states/influxdb_database.py b/salt/states/influxdb_database.py
new file mode 100644
index 0000000000..5d9838a509
--- /dev/null
+++ b/salt/states/influxdb_database.py
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+'''
+Management of InfluxDB databases
+================================
+'''
+
+
+def present(name, user=None, password=None, host=None, port=None):
+    '''
+    Ensure that the named database is present
+
+    name
+        The name of the database to create
+
+    user
+        The user to connect as (must be able to remove the database)
+
+    password
+        The password of the user
+
+    host
+        The host to connect to
+
+    port
+        The port to connect to
+
+    '''
+    ret = {'name': name,
+           'changes': {},
+           'result': True,
+           'comment': ''}
+
+    # check if database exists
+    if not __salt__['influxdb.db_exists'](name, user, password, host, port):
+        if __opts__['test']:
+            ret['result'] = None
+            ret['comment'] = 'Database {0} is absent and needs to be created'\
+                .format(name)
+            return ret
+        if __salt__['influxdb.db_create'](name, user, password, host, port):
+            ret['comment'] = 'Database {0} has been created'.format(name)
+            ret['changes'][name] = 'Present'
+            return ret
+        else:
+            ret['comment'] = 'Failed to create database {0}'.format(name)
+            ret['result'] = False
+            return ret
+
+    # fallback
+    ret['comment'] = 'Database {0} is already present, so cannot be created'\
+        .format(name)
+    return ret
+
+
+def absent(name, user=None, password=None, host=None, port=None):
+    '''
+    Ensure that the named database is absent
+
+    name
+        The name of the database to remove
+
+    user
+        The user to connect as (must be able to remove the database)
+
+    password
+        The password of the user
+
+    host
+        The host to connect to
+
+    port
+        The port to connect to
+
+    '''
+    ret = {'name': name,
+           'changes': {},
+           'result': True,
+           'comment': ''}
+
+    #check if database exists and remove it
+    if __salt__['influxdb.db_exists'](name, user, password, host, port):
+        if __opts__['test']:
+            ret['result'] = None
+            ret['comment'] = 'Database {0} is present and needs to be removed'\
+                .format(name)
+            return ret
+        if __salt__['influxdb.db_remove'](name, user, password, host, port):
+            ret['comment'] = 'Database {0} has been removed'.format(name)
+            ret['changes'][name] = 'Absent'
+            return ret
+        else:
+            ret['comment'] = 'Failed to remove database {0}'.format(name)
+            ret['result'] = False
+            return ret
+
+    # fallback
+    ret['comment'] = 'Database {0} is not present, so it cannot be removed'\
+        .format(name)
+    return ret