diff --git a/README.md b/README.md
index 7d33801..270b7a0 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # XML-API CCU Addon
 
-[![Release](https://img.shields.io/github/release/hobbyquaker/XML-API.svg)](https://github.com/hobbyquaker/XML-API/releases/latest)
-[![Downloads](https://img.shields.io/github/downloads/hobbyquaker/XML-API/latest/total.svg)](https://github.com/hobbyquaker/XML-API/releases/latest)
-[![Issues](https://img.shields.io/github/issues/hobbyquaker/XML-API.svg)](https://github.com/hobbyquaker/XML-API/issues)
+[![Release](https://img.shields.io/github/release/homematic-community/XML-API.svg)](https://github.com/homematic-community/XML-API/releases/latest)
+[![Downloads](https://img.shields.io/github/downloads/homematic-community/XML-API/latest/total.svg)](https://github.com/homematic-community/XML-API/releases/latest)
+[![Issues](https://img.shields.io/github/issues/homematic-community/XML-API.svg)](https://github.com/homematic-community/XML-API/issues)
 [![License](https://img.shields.io/badge/license-GPL%203.0-green.svg)](https://opensource.org/licenses/GPL-3.0)
 
 A HomeMatic CCU Addon implementing a xml request functionality as an interface to all homematic deviced available to a CCU device. This addon provides useful scripts that can be accessed via a HTTP request to a CCU device and allows to query and set all e.g. room- and devicetype names.
diff --git a/VERSION b/VERSION
index d2ab029..71f7f51 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.21
+1.22
diff --git a/xmlapi/update-check.cgi b/xmlapi/update-check.cgi
index 2b10feb..490cddd 100755
--- a/xmlapi/update-check.cgi
+++ b/xmlapi/update-check.cgi
@@ -1,14 +1,15 @@
 #!/bin/tclsh
 
-set checkURL    "https://raw.githubusercontent.com/hobbyquaker/XML-API/master/VERSION"
-set downloadURL "https://github.com/hobbyquaker/XML-API/releases/latest"
+set checkURL    "https://raw.githubusercontent.com/homematic-community/XML-API/master/VERSION"
+set downloadURL "https://github.com/homematic-community/XML-API/releases"
 
 catch {
   set input $env(QUERY_STRING)
   set pairs [split $input &]
   foreach pair $pairs {
-    if {0 != [regexp "^(\[^=]*)=(.*)$" $pair dummy varname val]} {
-      set $varname $val
+    if {$pair == "cmd=download"} {
+      set cmd "download"
+      break
     }
   }
 }