diff --git a/openstack-swift.spec b/openstack-swift.spec
index 5e3c67f..23cdb2b 100644
--- a/openstack-swift.spec
+++ b/openstack-swift.spec
@@ -7,7 +7,7 @@
 
 Name:             openstack-swift
 Version:          2.1.0
-Release:          1%{?dist}
+Release:          2%{?dist}
 Summary:          OpenStack Object Storage (Swift)
 
 Group:            Development/Languages
@@ -136,7 +136,7 @@ Summary:          A proxy server for Swift
 Group:            Applications/System
 
 Requires:         %{name} = %{version}-%{release}
-Requires:         python-keystoneclient
+Requires:         python-keystonemiddleware
 Requires:         openstack-swift-plugin-swift3
 
 %description      proxy
@@ -477,6 +477,9 @@ exit 0
 %doc LICENSE doc/build/html
 
 %changelog
+* Fri Sep 19 2014 Pete Zaitcev <zaitcev@redhat.com> - 2.1.0-2
+- Depend on python-keystonemiddleware instead of python-keystoneclient
+
 * Mon Sep 15 2014 Pete Zaitcev <zaitcev@redhat.com> - 2.1.0-1
 - Update to upstream 2.1.0
 
diff --git a/proxy-server.conf b/proxy-server.conf
index 0726b0e..96262e4 100644
--- a/proxy-server.conf
+++ b/proxy-server.conf
@@ -4,7 +4,7 @@ workers = 8
 user = swift
 
 [pipeline:main]
-pipeline = healthcheck cache authtoken keystone proxy-server
+pipeline = healthcheck cache authtoken keystone proxy-logging proxy-server
 
 [app:proxy-server]
 use = egg:swift#proxy
@@ -21,6 +21,9 @@ use = egg:swift#catch_errors
 [filter:healthcheck]
 use = egg:swift#healthcheck
 
+[filter:proxy-logging]
+use = egg:swift#proxy_logging
+
 [filter:keystone]
 use = egg:swift#keystoneauth
 operator_roles = admin, SwiftOperator
@@ -28,7 +31,7 @@ is_admin = true
 cache = swift.cache
 
 [filter:authtoken]
-paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
+paste.filter_factory = keystonemiddleware.auth_token:filter_factory
 admin_tenant_name = %SERVICE_TENANT_NAME%
 admin_user = %SERVICE_USER%
 admin_password = %SERVICE_PASSWORD%
@@ -36,4 +39,3 @@ auth_host = 127.0.0.1
 auth_port = 35357
 auth_protocol = http
 signing_dir = /tmp/keystone-signing-swift
-