diff --git a/_service b/_service
index b323f5b..870af2c 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
 	<service name="tar_scm" mode="disabled">
 		<param name="url">git://github.com/influxdata/influxdb.git</param>
 		<param name="scm">git</param>
-		<param name="revision">2.0</param>
+		<param name="revision">2.0.6</param>
 		<param name="versionformat">@PARENT_TAG@</param>
 		<param name="changesgenerate">disable</param>
 		<param name="versionrewrite-pattern">v(.*)</param>
diff --git a/influxdb.service b/influxdb.service
index 97fdeb3..6d2e38f 100644
--- a/influxdb.service
+++ b/influxdb.service
@@ -1,11 +1,12 @@
 [Unit]
-Description=InfluxDB database server
+Description=InfluxDB is an open-source, distributed, time series database
+Documentation=https://docs.influxdata.com/influxdb/
 After=network.target
 
 [Service]
-Environment="config=/etc/influxdb/config.toml" "pidfile=/run/influxdb/influxdb.pid"
-LimitNOFILE=100000
-ExecStart=/usr/bin/influxd -config ${config} -pidfile ${pidfile}
+Environment="INFLUXD_CONFIG_PATH=/etc/influxdb2/config.toml"
+LimitNOFILE=65536
+ExecStart=/usr/bin/influxd
 Type=simple
 StandardOutput=journal
 StandardError=journal
diff --git a/influxdb2-2.0.4.tar.xz b/influxdb2-2.0.4.tar.xz
deleted file mode 100644
index 8551cab..0000000
--- a/influxdb2-2.0.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c761a72931ebe18027d8d1dbc0b7ec58092b3b242003052e0d8e06911693fa84
-size 11017508
diff --git a/influxdb2-2.0.6.tar.xz b/influxdb2-2.0.6.tar.xz
new file mode 100644
index 0000000..fbf72cb
--- /dev/null
+++ b/influxdb2-2.0.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:30e6807f34e94ff8a47cfbd71bd8d194d5ccb0a9dbf9b6b8821edf24a0c5b914
+size 11121036
diff --git a/influxdb2.changes b/influxdb2.changes
index 734ae58..f188ab3 100644
--- a/influxdb2.changes
+++ b/influxdb2.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed May 19 21:51:38 UTC 2021 - Michal Hrusecky <michal.hrusecky@opensuse.org>
+
+- Update to version 2.0.6, see
+  * https://github.com/influxdata/influxdb/releases/tag/v2.0.6
+  * https://github.com/influxdata/influxdb/releases/tag/v2.0.5
+
+-------------------------------------------------------------------
+Mon May 17 21:34:31 UTC 2021 - Michal Hrusecky <michal.hrusecky@opensuse.org>
+
+- Update service file not to use invalid options
+- Dropping config file as upstream does and dropping unused directories
+
 -------------------------------------------------------------------
 Thu Mar 18 08:12:08 UTC 2021 - Matwey Kornilov <matwey.kornilov@gmail.com>
 
diff --git a/influxdb2.spec b/influxdb2.spec
index bc7b92d..9a1b772 100644
--- a/influxdb2.spec
+++ b/influxdb2.spec
@@ -20,7 +20,7 @@ Name:           influxdb2
 Summary:        Scalable datastore for metrics, events, and real-time analytics
 License:        MIT
 Group:          Productivity/Databases/Servers
-Version:        2.0.4
+Version:        2.0.6
 Release:        0
 URL:            https://github.com/influxdata/influxdb
 Source:         %{name}-%{version}.tar.xz
@@ -35,7 +35,7 @@ BuildRequires:  fdupes
 BuildRequires:  go >= 1.15
 BuildRequires:  golang-packaging >= 15.0.8
 BuildRequires:  systemd-rpm-macros
-BuildRequires:  pkgconfig(flux) = 0.105.1
+BuildRequires:  pkgconfig(flux) >= 0.116.0
 %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
 %{systemd_requires}
 Requires(post): systemd
@@ -72,10 +72,8 @@ export GO111MODULE=on
 %gosrc
 %fdupes -s %{buildroot}/%{go_contribsrcdir}/github.com/influxdata/influxdb
 
-mkdir -p %{buildroot}%{_sysconfdir}/influxdb
 mkdir -p %{buildroot}%{_localstatedir}/log/influxdb
 mkdir -p %{buildroot}%{_localstatedir}/lib/influxdb
-mkdir -p %{buildroot}%{_localstatedir}/lib/influxdb/{data,meta,hh,wal}
 mkdir -p %{buildroot}%{_sbindir}
 install -D -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/influxdb.service
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcinfluxdb
@@ -102,7 +100,6 @@ install -D -m 0755 -t %{buildroot}%{_bindir} %{_builddir}/go/bin/*
 %files
 %license LICENSE
 %doc README.md CHANGELOG.md
-%dir %{_sysconfdir}/influxdb
 %{_bindir}/chronograf-migrator
 %{_bindir}/influx
 %{_bindir}/influxd
@@ -114,10 +111,6 @@ install -D -m 0755 -t %{buildroot}%{_bindir} %{_builddir}/go/bin/*
 %{_tmpfilesdir}/influxdb.conf
 %attr(0755, influxdb, influxdb) %dir %{_localstatedir}/log/influxdb
 %attr(0755, influxdb, influxdb) %dir %{_localstatedir}/lib/influxdb
-%attr(0755, influxdb, influxdb) %dir %{_localstatedir}/lib/influxdb/meta
-%attr(0755, influxdb, influxdb) %dir %{_localstatedir}/lib/influxdb/data
-%attr(0755, influxdb, influxdb) %dir %{_localstatedir}/lib/influxdb/hh
-%attr(0700, influxdb, influxdb) %dir %{_localstatedir}/lib/influxdb/wal
 
 %files devel
 %license LICENSE
diff --git a/vendor.tar.xz b/vendor.tar.xz
index 04d745e..f2c09af 100644
--- a/vendor.tar.xz
+++ b/vendor.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d86c73cae27c699dbfcb4d8314138a1cb2e0d5c1b155c19edb3ca871f1c7b267
-size 7192488
+oid sha256:6bf8d16f72648d8438898066f22bff0d6ea724c2a04d72ac449e7828a414f8a5
+size 7386816