diff --git a/golang-github-influxdb-influxdb.spec b/golang-github-influxdb-influxdb.spec
index 9fe58b9..6b7796a 100644
--- a/golang-github-influxdb-influxdb.spec
+++ b/golang-github-influxdb-influxdb.spec
@@ -3,13 +3,13 @@
 %global project         influxdb
 %global repo            influxdb
 %global import_path     %{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit          b611d020cd78886232cfa6c2ea0606b49d307ed2
 %global debug_package   %{nil}
+%global commit          9485e99796c53635fbf179b3e973c363937de00b
 %global shortcommit     %(c=%{commit}; echo ${c:0:7})
 
 Name:           golang-github-influxdb-influxdb
-Version:        0.8.0
-Release:        0.5.rc4.git%{shortcommit}%{?dist}
+Version:        0.8.5
+Release:        0.1.git%{shortcommit}%{?dist}
 Summary:        Scalable datastore for metrics, events, and real-time analytics
 License:        MIT
 URL:            http://godoc.org/%{import_path}
@@ -85,6 +85,9 @@ BuildRequires:  golang(github.com/jmhodges/levigo)
 BuildRequires:  golang(code.google.com/p/goprotobuf/proto)
 BuildRequires:  golang(github.com/stretchr/testify/assert)
 BuildRequires:  golang(github.com/stretchr/testify/mock)
+BuildRequires:  golang(github.com/rakyll/statik)
+BuildRequires:  golang(github.com/dgnorton/goback)
+BuildRequires:  golang(github.com/kimor79/gollectd)
 Requires:       golang >= 1.2.1-3
 Requires:       golang(%{import_path}/client) = %{version}-%{release}
 Requires:       golang(%{import_path}/datastore) = %{version}-%{release}
@@ -96,9 +99,13 @@ Requires:       golang(github.com/jmhodges/levigo)
 Requires:       golang(code.google.com/p/goprotobuf/proto)
 Requires:       golang(github.com/stretchr/testify/assert)
 Requires:       golang(github.com/stretchr/testify/mock)
+Requires:       golang(github.com/rakyll/statik)
+Requires:       golang(github.com/dgnorton/goback)
+Requires:       golang(github.com/kimor79/gollectd)
 Summary:        %{summary}
 Provides:       golang(%{import_path}/admin) = %{version}-%{release}
 Provides:       golang(%{import_path}/api) = %{version}-%{release}
+Provides:       golang(%{import_path}/api/collectd) = %{version}-%{release}
 Provides:       golang(%{import_path}/api/graphite) = %{version}-%{release}
 Provides:       golang(%{import_path}/api/http) = %{version}-%{release}
 Provides:       golang(%{import_path}/api/udp) = %{version}-%{release}
@@ -114,6 +121,7 @@ Provides:       golang(%{import_path}/integration/helpers) = %{version}-%{releas
 Provides:       golang(%{import_path}/metastore) = %{version}-%{release}
 Provides:       golang(%{import_path}/parser) = %{version}-%{release}
 Provides:       golang(%{import_path}/protocol) = %{version}-%{release}
+Provides:       golang(%{import_path}/server) = %{version}-%{release}
 Provides:       golang(%{import_path}/tools/benchmark-multi-series) = %{version}-%{release}
 Provides:       golang(%{import_path}/tools/benchmark-storage) = %{version}-%{release}
 Provides:       golang(%{import_path}/tools/benchmark) = %{version}-%{release}
@@ -141,57 +149,45 @@ in < 100ms.
 
 %install
 install -d %{buildroot}%{gopath}/src/%{import_path}
-cp -rpav {admin,api,checkers,client,cluster,common,configuration,coordinator,daemon,datastore,engine,integration,metastore,parser,protocol,tools,wal}  %{buildroot}%{gopath}/src/%{import_path}/
+cp -rpav {admin,api,checkers,client,cluster,common,configuration,coordinator,daemon,datastore,engine,integration,metastore,parser,protocol,server,tools,wal}  %{buildroot}%{gopath}/src/%{import_path}/
 
 %check
 # tests are skiped as there are unresolved dependencies
 
 %files client
 %doc CHANGELOG.md LICENSE README.md Makefile.in Gemfile
-%dir %{gopath}/src/%{import_path}/client
-%{gopath}/src/%{import_path}/client/*
+%{gopath}/src/%{import_path}/client
 
 %files datastore
 %doc CHANGELOG.md LICENSE README.md Makefile.in Gemfile
-%dir %{gopath}/src/%{import_path}/datastore
-%{gopath}/src/%{import_path}/datastore/*
+%{gopath}/src/%{import_path}/datastore
 
 %files devel
 %doc CHANGELOG.md LICENSE README.md Makefile.in Gemfile
 %dir %{gopath}/src/github.com/influxdb
 %dir %{gopath}/src/%{import_path}
-%dir %{gopath}/src/%{import_path}/admin
-%dir %{gopath}/src/%{import_path}/api
-%dir %{gopath}/src/%{import_path}/checkers
-%dir %{gopath}/src/%{import_path}/cluster
-%dir %{gopath}/src/%{import_path}/common
-%dir %{gopath}/src/%{import_path}/configuration
-%dir %{gopath}/src/%{import_path}/coordinator
-%dir %{gopath}/src/%{import_path}/daemon
-%dir %{gopath}/src/%{import_path}/engine
-%dir %{gopath}/src/%{import_path}/integration
-%dir %{gopath}/src/%{import_path}/metastore
-%dir %{gopath}/src/%{import_path}/parser
-%dir %{gopath}/src/%{import_path}/protocol
-%dir %{gopath}/src/%{import_path}/tools
-%dir %{gopath}/src/%{import_path}/wal
-%{gopath}/src/%{import_path}/admin/*
-%{gopath}/src/%{import_path}/api/*
-%{gopath}/src/%{import_path}/checkers/*
-%{gopath}/src/%{import_path}/cluster/*
-%{gopath}/src/%{import_path}/common/*
-%{gopath}/src/%{import_path}/configuration/*
-%{gopath}/src/%{import_path}/coordinator/*
-%{gopath}/src/%{import_path}/daemon/*
-%{gopath}/src/%{import_path}/engine/*
-%{gopath}/src/%{import_path}/integration/*
-%{gopath}/src/%{import_path}/metastore/*
-%{gopath}/src/%{import_path}/parser/*
-%{gopath}/src/%{import_path}/protocol/*
-%{gopath}/src/%{import_path}/tools/*
-%{gopath}/src/%{import_path}/wal/*
+%{gopath}/src/%{import_path}/admin
+%{gopath}/src/%{import_path}/api
+%{gopath}/src/%{import_path}/checkers
+%{gopath}/src/%{import_path}/cluster
+%{gopath}/src/%{import_path}/common
+%{gopath}/src/%{import_path}/configuration
+%{gopath}/src/%{import_path}/coordinator
+%{gopath}/src/%{import_path}/daemon
+%{gopath}/src/%{import_path}/engine
+%{gopath}/src/%{import_path}/integration
+%{gopath}/src/%{import_path}/metastore
+%{gopath}/src/%{import_path}/parser
+%{gopath}/src/%{import_path}/protocol
+%{gopath}/src/%{import_path}/server
+%{gopath}/src/%{import_path}/tools
+%{gopath}/src/%{import_path}/wal
 
 %changelog
+* Tue Jan 06 2015 jchaloup <jchaloup@redhat.com> - 0.8.5-0.1.git9485e99
+- Update to 0.8.5
+  resolves: #1161618
+
 * Sun Nov 09 2014 jchaloup <jchaloup@redhat.com> - 0.8.0-0.5.rc4.git67f9869
 - Choose the correct architecture
   related: #1141892