diff --git a/Android.mk b/Android.mk
index aa4753b..d8db62d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -53,12 +53,13 @@ include $(BUILD_PREBUILT)
 include $(CLEAR_VARS)
 LOCAL_MODULE := TimeService
 LOCAL_MODULE_OWNER := motorola
-LOCAL_SRC_FILES := proprietary/app/TimeService/TimeService.apk
+LOCAL_SRC_FILES := proprietary/vendor/app/TimeService/TimeService.apk
 LOCAL_CERTIFICATE := platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := APPS
 LOCAL_DEX_PREOPT := false
 LOCAL_MODULE_SUFFIX := .apk
+LOCAL_VENDOR_MODULE := true
 include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
diff --git a/proprietary/app/TimeService/TimeService.apk b/proprietary/app/TimeService/TimeService.apk
deleted file mode 100644
index c32da0e..0000000
Binary files a/proprietary/app/TimeService/TimeService.apk and /dev/null differ
diff --git a/proprietary/vendor/app/TimeService/TimeService.apk b/proprietary/vendor/app/TimeService/TimeService.apk
new file mode 100644
index 0000000..e123de4
Binary files /dev/null and b/proprietary/vendor/app/TimeService/TimeService.apk differ
diff --git a/proprietary/vendor/bin/time_daemon b/proprietary/vendor/bin/time_daemon
index 0a521b3..fdb7985 100755
Binary files a/proprietary/vendor/bin/time_daemon and b/proprietary/vendor/bin/time_daemon differ
diff --git a/proprietary/vendor/lib/libtime_genoff.so b/proprietary/vendor/lib/libtime_genoff.so
index 80c6d28..f7723eb 100644
Binary files a/proprietary/vendor/lib/libtime_genoff.so and b/proprietary/vendor/lib/libtime_genoff.so differ
diff --git a/proprietary/vendor/lib64/libtime_genoff.so b/proprietary/vendor/lib64/libtime_genoff.so
index 8f6ac01..e47f9d8 100644
Binary files a/proprietary/vendor/lib64/libtime_genoff.so and b/proprietary/vendor/lib64/libtime_genoff.so differ