diff --git a/GooManager.apk b/GooManager.apk
new file mode 100644
index 0000000..ab5ae60
Binary files /dev/null and b/GooManager.apk differ
diff --git a/galaxys2.mk b/galaxys2.mk
index d933b41..34f1d3b 100644
--- a/galaxys2.mk
+++ b/galaxys2.mk
@@ -133,6 +133,9 @@ endif
 PRODUCT_COPY_FILES += \
     $(LOCAL_KERNEL):kernel
 
+# Add support for goo.im
+(call inherit-product, device/samsung/galaxys2/goo.mk)
+
 # See comment at the top of this file. This is where the other
 # half of the device-specific product definition file takes care
 # of the aspects that require proprietary drivers that aren't
diff --git a/goo.mk b/goo.mk
new file mode 100644
index 0000000..7919f69
--- /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=cm7galaxys2nightly \
+        ro.goo.version=$(shell date +%s)
+
+# include goo manager
+PRODUCT_COPY_FILES += \
+       device/samsung/galaxys2/GooManager.apk:system/app/GooManager.apk