diff --git a/plugins/zwave/build.xml b/plugins/hal-zigbee/build.xml
similarity index 89%
rename from plugins/zwave/build.xml
rename to plugins/hal-zigbee/build.xml
index 4a20e064..97281d47 100755
--- a/plugins/zwave/build.xml
+++ b/plugins/hal-zigbee/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="ZWave Plugin" >
+<project name="Hal Zigbee Plugin" >
 
     <!-- ________________________ PROPERTIES AND SETTINGS ________________________ -->
 
@@ -13,7 +13,7 @@
     <property name="compileDir" value="${buildRoot}/production" />
     <property name="compileTestDir" value="${buildRoot}/test" />
     <property name="releaseDir" value="${buildRoot}/release" />
-    <property name="releaseJar" value="zwave.jar" />
+    <property name="releaseJar" value="hal-zigbee.jar" />
     <property name="reportsDir" value="../../${buildRoot}/reports" /> <!-- Use Hal reports folder -->
 
     <!-- ________________________ TARGETS ________________________ -->
diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zwave/HalZigbeeController.java b/plugins/hal-zigbee/src/se/hal/plugin/zwave/HalZigbeeController.java
new file mode 100644
index 00000000..8e091fc1
--- /dev/null
+++ b/plugins/hal-zigbee/src/se/hal/plugin/zwave/HalZigbeeController.java
@@ -0,0 +1,4 @@
+package se.hal.plugin.zwave;
+
+public class HalZigbeeController {
+}
diff --git a/plugins/hal-zigbee/src/se/hal/plugin/zwave/plugin.json b/plugins/hal-zigbee/src/se/hal/plugin/zwave/plugin.json
new file mode 100755
index 00000000..209c89c0
--- /dev/null
+++ b/plugins/hal-zigbee/src/se/hal/plugin/zwave/plugin.json
@@ -0,0 +1,7 @@
+{
+	"version": 1.0,
+	"name": "Hal-Zigbee",
+	"interfaces": [
+		{"se.hal.intf.HalAutoScannableController": "se.hal.plugin.zigbee.HalZigbeeController"}
+	]
+}
\ No newline at end of file