diff --git a/goo.mk b/goo.mk
new file mode 100644
index 0000000..4ffcfdb
--- /dev/null
+++ b/goo.mk
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2012 the cmhtcleo team
+#
+# GooManager specific stuff
+#
+
+PRODUCT_PROPERTY_OVERRIDES += \
+        ro.goo.developerid=cmhtcleo \
+        ro.goo.rom=cm7nightly \
+        ro.goo.version=$(shell date +%s)
+
+# include goo manager
+PRODUCT_COPY_FILES += \
+       device/htc/leo/prebuilt/GooManager.apk:system/app/GooManager.apk
diff --git a/leo.mk b/leo.mk
index f18e2c8..e249725 100755
--- a/leo.mk
+++ b/leo.mk
@@ -113,5 +113,8 @@ $(call inherit-product, device/htc/leo/media_a1026.mk)
 # stuff common to all HTC phones
 $(call inherit-product, device/htc/common/common.mk)
 
+# goo.im stuff
+$(call inherit-product, device/htc/leo/goo.mk)
+
 PRODUCT_NAME := htc_leo
 PRODUCT_DEVICE := leo
diff --git a/prebuilt/GooManager.apk b/prebuilt/GooManager.apk
new file mode 100644
index 0000000..ab5ae60
Binary files /dev/null and b/prebuilt/GooManager.apk differ