diff --git a/click.mk b/click.mk
index 29eddeb..7432314 100644
--- a/click.mk
+++ b/click.mk
@@ -85,6 +85,9 @@ $(call inherit-product, device/common/gps/gps_eu_supl.mk)
 $(call inherit-product, device/htc/common/common.mk)
 $(call inherit-product, build/target/product/full_base.mk)
 
+# Add goo.im support
+$(call inherit-product, device/htc/click/goo.mk)
+
 PRODUCT_NAME := htc_click
 PRODUCT_DEVICE := click
 
diff --git a/goo.mk b/goo.mk
new file mode 100644
index 0000000..da76458
--- /dev/null
+++ b/goo.mk
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2012 the arifali
+#
+# GooManager specific stuff
+#
+
+PRODUCT_PROPERTY_OVERRIDES += \
+        ro.goo.developerid=arifali \
+        ro.goo.rom=cm7clicknightly \
+        ro.goo.version=$(shell date +%s)
+
+# include goo manager
+#PRODUCT_COPY_FILES += \
+#       device/htc/click/prebuilt/GooManager.apk:system/app/GooManager.apk