diff --git a/projects/ATV/options b/projects/ATV/options
index 56e0078371..e5ed33b0e1 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -1,5 +1,8 @@
 # Name of the Distro to build (full name, without special characters)
   DISTRONAME="OpenELEC"
+  if [ "$XBMC" = master ]; then
+    DISTRONAME="OpenELEC_Helix"
+  fi
 
 # short project description
   DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
@@ -116,6 +119,9 @@
 
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
+  if [ "$XBMC" = master ]; then
+    MEDIACENTER="xbmc-master"
+  fi
 
 # Skins to install (Confluence)
 # Space separated list is supported,
diff --git a/projects/Cuboxi/options b/projects/Cuboxi/options
index 25c22eb2ab..89adff0773 100644
--- a/projects/Cuboxi/options
+++ b/projects/Cuboxi/options
@@ -1,5 +1,8 @@
 # Name of the Distro to build (full name, without special characters)
   DISTRONAME="OpenELEC"
+  if [ "$XBMC" = master ]; then
+    DISTRONAME="OpenELEC_Helix"
+  fi
 
 # short project description
   DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
@@ -116,6 +119,9 @@
 
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
+  if [ "$XBMC" = master ]; then
+    MEDIACENTER="xbmc-master"
+  fi
 
 # Skins to install (Confluence)
 # Space separated list is supported,
diff --git a/projects/Generic/options b/projects/Generic/options
index 1904e51635..a9417f1fe5 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -1,5 +1,8 @@
 # Name of the Distro to build (full name, without special characters)
   DISTRONAME="OpenELEC"
+  if [ "$XBMC" = master ]; then
+    DISTRONAME="OpenELEC_Helix"
+  fi
 
 # short project description
   DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
@@ -116,6 +119,9 @@
 
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
+  if [ "$XBMC" = master ]; then
+    MEDIACENTER="xbmc-master"
+  fi
 
 # Skins to install (Confluence)
 # Space separated list is supported,
diff --git a/projects/RPi/options b/projects/RPi/options
index fd6721fbb4..7e59fd7c82 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -1,5 +1,8 @@
 # Name of the Distro to build (full name, without special characters)
   DISTRONAME="OpenELEC"
+  if [ "$XBMC" = master ]; then
+    DISTRONAME="OpenELEC_Helix"
+  fi
 
 # short project description
   DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
@@ -116,6 +119,9 @@
 
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
+  if [ "$XBMC" = master ]; then
+    MEDIACENTER="xbmc-master"
+  fi
 
 # Skins to install (Confluence)
 # Space separated list is supported,
diff --git a/projects/Virtual/options b/projects/Virtual/options
index b33439335b..dc667902ed 100644
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -1,5 +1,8 @@
 # Name of the Distro to build (full name, without special characters)
   DISTRONAME="OpenELEC"
+  if [ "$XBMC" = master ]; then
+    DISTRONAME="OpenELEC_Helix"
+  fi
 
 # short project description
   DESCRIPTION="OpenELEC is a fast and userfriendly XBMC Mediacenter distribution."
@@ -111,6 +114,9 @@
 
 # Mediacenter to use (xbmc / no)
   MEDIACENTER="xbmc"
+  if [ "$XBMC" = master ]; then
+    MEDIACENTER="xbmc-master"
+  fi
 
 # Skins to install (Confluence)
 # Space separated list is supported,