diff --git a/mRemoteV1/App/App.Info.vb b/mRemoteV1/App/App.Info.vb
index e0a37e311..9b1838a5d 100644
--- a/mRemoteV1/App/App.Info.vb
+++ b/mRemoteV1/App/App.Info.vb
@@ -25,11 +25,18 @@ Namespace App
 
         Public Class Update
             Public Shared ReadOnly URL As String = "http://update.mremoteng.org/"
-#If DEBUG Then
-            Public Shared ReadOnly File As String = "update-debug.txt"
-#Else
-            Public Shared ReadOnly File As String = "update.txt"
-#End If
+            Public Shared ReadOnly Property File As String
+                Get
+                    Select Case My.Settings.UpdateChannel.ToLowerInvariant()
+                        Case "beta"
+                            Return "update-beta.txt"
+                        Case "debug"
+                            Return "update-debug.txt"
+                        Case Else
+                            Return "update.txt"
+                    End Select
+                End Get
+            End Property
         End Class
 
         Public Class Connections
diff --git a/mRemoteV1/My Project/Settings.Designer.vb b/mRemoteV1/My Project/Settings.Designer.vb
index 573198dd9..648b43b45 100644
--- a/mRemoteV1/My Project/Settings.Designer.vb	
+++ b/mRemoteV1/My Project/Settings.Designer.vb	
@@ -2335,6 +2335,16 @@ Namespace My
                 Me("IdentifyQuickConnectTabs") = value
             End Set
         End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Configuration.SettingsProviderAttribute(GetType(mRemoteNG.Config.Settings.Providers.ChooseProvider)),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("release")>  _
+        Public ReadOnly Property UpdateChannel() As String
+            Get
+                Return CType(Me("UpdateChannel"),String)
+            End Get
+        End Property
     End Class
 End Namespace
 
diff --git a/mRemoteV1/My Project/Settings.settings b/mRemoteV1/My Project/Settings.settings
index 571b4d721..310dc2175 100644
--- a/mRemoteV1/My Project/Settings.settings	
+++ b/mRemoteV1/My Project/Settings.settings	
@@ -530,5 +530,8 @@
     <Setting Name="IdentifyQuickConnectTabs" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Roaming="true" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="UpdateChannel" Provider="mRemoteNG.Config.Settings.Providers.ChooseProvider" Type="System.String" Scope="Application">
+      <Value Profile="(Default)">release</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file
diff --git a/mRemoteV1/app.config b/mRemoteV1/app.config
index 4c26e7755..a538f2355 100644
--- a/mRemoteV1/app.config
+++ b/mRemoteV1/app.config
@@ -575,6 +575,9 @@
             <setting name="SupportedUICultures" serializeAs="String">
                 <value>de,en,en-US,es-AR,es,fr,it,nl,pt,pl,ru,uk,zh-CN</value>
             </setting>
+            <setting name="UpdateChannel" serializeAs="String">
+                <value>release</value>
+            </setting>
         </mRemoteNG.My.MySettings>
     </applicationSettings>
 <startup><supportedRuntime version="v2.0.50727"/></startup></configuration>