diff --git a/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh b/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh
index 39cd353..0fa185a 100755
--- a/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh
+++ b/gluon/gluon-alfred/files/lib/gluon/alfred/announce.sh
@@ -36,7 +36,7 @@ fi
 
 json_add_object "software"
 	json_add_object "firmware"
-		json_add_string "base" "gluon-$(cat /lib/gluon/version)"
+		json_add_string "base" "gluon-$(cat /lib/gluon/gluon-version)"
 		json_add_string "release" "$(cat /lib/gluon/release)"
 	json_close_object # firmware
 
diff --git a/gluon/gluon-core/Makefile b/gluon/gluon-core/Makefile
index 74f3bb4..7bee084 100644
--- a/gluon/gluon-core/Makefile
+++ b/gluon/gluon-core/Makefile
@@ -34,7 +34,7 @@ define Package/gluon-core/install
 	$(GLUON_GENERATE) ./generate/* $(1)/
 
 	$(INSTALL_DIR) $(1)/lib/gluon
-	echo "$(GLUON_VERSION)" > $(1)/lib/gluon/version
+	echo "$(GLUON_VERSION)" > $(1)/lib/gluon/gluon-version
 	echo "$(GLUON_RELEASE)" > $(1)/lib/gluon/release
 endef
 
diff --git a/gluon/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade b/gluon/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade
index f075e53..d8ae367 100755
--- a/gluon/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade
+++ b/gluon/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade
@@ -12,6 +12,9 @@ else
 fi
 
 
+# Temporary fix for broken upgrades (happened between 20140225 and 20140226, remove next week)
+if [ -f "$VERSION_DIR" ]; then rm "$VERSION_DIR"; fi
+
 mkdir -p "$VERSION_DIR"