diff --git a/karaf/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml b/karaf/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml
deleted file mode 100644
index 956a98d..0000000
--- a/karaf/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:osgi="http://www.springframework.org/schema/osgi"
-       xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:gshell="http://servicemix.apache.org/schema/servicemix-gshell"
-       xsi:schemaLocation="
-  http://www.springframework.org/schema/beans
-  http://www.springframework.org/schema/beans/spring-beans.xsd
-  http://www.springframework.org/schema/osgi
-  http://www.springframework.org/schema/osgi/spring-osgi.xsd
-  http://www.springframework.org/schema/osgi-compendium
-  http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
-  http://www.springframework.org/schema/util
-  http://www.springframework.org/schema/util/spring-util.xsd
-  http://servicemix.apache.org/schema/servicemix-gshell
-  http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
-
-    <gshell:command-bundle>
-        <gshell:command name="obr/addUrl">
-            <gshell:action class="org.apache.felix.karaf.gshell.obr.AddUrlCommand">
-                <property name="bundleContext" ref="bundleContext"/>
-            </gshell:action>
-        </gshell:command>
-        <gshell:command name="obr/deploy">
-            <gshell:action class="org.apache.felix.karaf.gshell.obr.DeployCommand">
-                <property name="bundleContext" ref="bundleContext"/>
-            </gshell:action>
-        </gshell:command>
-        <gshell:command name="obr/info">
-            <gshell:action class="org.apache.felix.karaf.gshell.obr.InfoCommand">
-                <property name="bundleContext" ref="bundleContext"/>
-            </gshell:action>
-        </gshell:command>
-        <gshell:command name="obr/list">
-            <gshell:action class="org.apache.felix.karaf.gshell.obr.ListCommand">
-                <property name="bundleContext" ref="bundleContext"/>
-            </gshell:action>
-        </gshell:command>
-        <gshell:command name="obr/listUrl">
-            <gshell:action class="org.apache.felix.karaf.gshell.obr.ListUrlCommand">
-                <property name="bundleContext" ref="bundleContext"/>
-            </gshell:action>
-        </gshell:command>
-        <gshell:command name="obr/removeUrl">
-            <gshell:action class="org.apache.felix.karaf.gshell.obr.RemoveUrlCommand">
-                <property name="bundleContext" ref="bundleContext"/>
-            </gshell:action>
-        </gshell:command>
-        <gshell:command name="obr/refreshUrl">
-            <gshell:action class="org.apache.felix.karaf.gshell.obr.RefreshUrlCommand">
-                <property name="bundleContext" ref="bundleContext"/>
-            </gshell:action>
-        </gshell:command>
-        <gshell:command name="obr/source">
-            <gshell:action class="org.apache.felix.karaf.gshell.obr.SourceCommand">
-                <property name="bundleContext" ref="bundleContext"/>
-            </gshell:action>
-        </gshell:command>
-        <gshell:command name="obr/start">
-            <gshell:action class="org.apache.felix.karaf.gshell.obr.StartCommand">
-                <property name="bundleContext" ref="bundleContext"/>
-            </gshell:action>
-        </gshell:command>
-    </gshell:command-bundle>
-
-</beans>
diff --git a/karaf/gshell/gshell-obr/src/main/resources/OSGI-INF/blueprint/gshell-obr.xml b/karaf/gshell/gshell-obr/src/main/resources/OSGI-INF/blueprint/gshell-obr.xml
new file mode 100644
index 0000000..7308e32
--- /dev/null
+++ b/karaf/gshell/gshell-obr/src/main/resources/OSGI-INF/blueprint/gshell-obr.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
+
+    <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/gshell/v1.0.0">
+        <command name="obr/addUrl">
+            <action class="org.apache.felix.karaf.gshell.obr.AddUrlCommand">
+                <property name="bundleContext" ref="bundleContext"/>
+            </action>
+        </command>
+        <command name="obr/deploy">
+            <action class="org.apache.felix.karaf.gshell.obr.DeployCommand">
+                <property name="bundleContext" ref="bundleContext"/>
+            </action>
+        </command>
+        <command name="obr/info">
+            <action class="org.apache.felix.karaf.gshell.obr.InfoCommand">
+                <property name="bundleContext" ref="bundleContext"/>
+            </action>
+        </command>
+        <command name="obr/list">
+            <action class="org.apache.felix.karaf.gshell.obr.ListCommand">
+                <property name="bundleContext" ref="bundleContext"/>
+            </action>
+        </command>
+        <command name="obr/listUrl">
+            <action class="org.apache.felix.karaf.gshell.obr.ListUrlCommand">
+                <property name="bundleContext" ref="bundleContext"/>
+            </action>
+        </command>
+        <command name="obr/removeUrl">
+            <action class="org.apache.felix.karaf.gshell.obr.RemoveUrlCommand">
+                <property name="bundleContext" ref="bundleContext"/>
+            </action>
+        </command>
+        <command name="obr/refreshUrl">
+            <action class="org.apache.felix.karaf.gshell.obr.RefreshUrlCommand">
+                <property name="bundleContext" ref="bundleContext"/>
+            </action>
+        </command>
+        <command name="obr/source">
+            <action class="org.apache.felix.karaf.gshell.obr.SourceCommand">
+                <property name="bundleContext" ref="bundleContext"/>
+            </action>
+        </command>
+        <command name="obr/start">
+            <action class="org.apache.felix.karaf.gshell.obr.StartCommand">
+                <property name="bundleContext" ref="bundleContext"/>
+            </action>
+        </command>
+    </command-bundle>
+
+</blueprint>