diff --git a/contrib/heat_barbican/requirements.txt b/contrib/heat_barbican/requirements.txt
deleted file mode 100644
index fda243ea5..000000000
--- a/contrib/heat_barbican/requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
-python-barbicanclient>=2.0.0
diff --git a/contrib/heat_barbican/setup.cfg b/contrib/heat_barbican/setup.cfg
index e356e4026..2c1ab178c 100644
--- a/contrib/heat_barbican/setup.cfg
+++ b/contrib/heat_barbican/setup.cfg
@@ -25,10 +25,6 @@ packages =
 data_files =
     lib/heat/barbican = heat_barbican/resources/*
 
-[entry_points]
-heat.clients =
-    barbican = heat_barbican.client:BarbicanClientPlugin
-
 [global]
 setup-hooks =
     pbr.hooks.setup_hook
diff --git a/contrib/heat_barbican/heat_barbican/client.py b/heat/engine/clients/os/barbican.py
similarity index 90%
rename from contrib/heat_barbican/heat_barbican/client.py
rename to heat/engine/clients/os/barbican.py
index 9f5eade12..bb2a31bb0 100644
--- a/contrib/heat_barbican/heat_barbican/client.py
+++ b/heat/engine/clients/os/barbican.py
@@ -14,10 +14,7 @@
 from heat.engine.clients import client_plugin
 
 
-try:
-    from barbicanclient import client as barbican_client
-except ImportError:
-    barbican_client = None
+from barbicanclient import client as barbican_client
 
 
 class BarbicanClientPlugin(client_plugin.ClientPlugin):
diff --git a/requirements.txt b/requirements.txt
index e2babc473..76e9c9e4d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,6 +27,7 @@ oslo.versionedobjects>=0.1.1
 PasteDeploy>=1.5.0
 posix_ipc
 pycrypto>=2.6
+python-barbicanclient>=3.0.1
 python-ceilometerclient>=1.0.13
 python-cinderclient>=1.2.0
 python-glanceclient>=0.15.0
diff --git a/setup.cfg b/setup.cfg
index 38c824a3e..be736df33 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -46,6 +46,7 @@ oslo.config.opts =
     heat_integrationtests.common.config = heat_integrationtests.common.config:list_opts
 
 heat.clients =
+    barbican = heat.engine.clients.os.barbican:BarbicanClientPlugin
     ceilometer = heat.engine.clients.os.ceilometer:CeilometerClientPlugin
     cinder = heat.engine.clients.os.cinder:CinderClientPlugin
     glance = heat.engine.clients.os.glance:GlanceClientPlugin