diff --git a/config/common.mk b/config/common.mk
index a1eb44b6..76203b80 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -108,10 +108,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
     vendor/replicant/prebuilt/common/lib/content-types.properties:system/lib/content-types.properties
 
-# Prebuilt apps
-PRODUCT_COPY_FILES +=  \
-    vendor/replicant/prebuilt/common/apps/FDroid.apk:system/app/FDroid.apk
-
 # Enable SIP+VoIP on all targets
 PRODUCT_COPY_FILES += \
     frameworks/native/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
@@ -168,7 +164,9 @@ PRODUCT_PACKAGES += \
     DataUsageProvider \
     WallpaperPicker \
     SoundRecorder \
-    Screencast
+    Screencast \
+    F-Droid \
+    FDroidPrivilegedExtension
 
 # Exchange support
 PRODUCT_PACKAGES += \
diff --git a/prebuilt/common/Android.mk b/prebuilt/common/Android.mk
index f15b178c..137030bd 100644
--- a/prebuilt/common/Android.mk
+++ b/prebuilt/common/Android.mk
@@ -8,3 +8,11 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
 include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := F-Droid
+LOCAL_MODULE_CLASS := APPS
+LOCAL_CERTIFICATE := PRESIGNED
+LOCAL_SRC_FILES := apps/FDroid.apk
+
+include $(BUILD_PREBUILT)
diff --git a/sign-build b/sign-build
index c4561f03..daf83c7d 100755
--- a/sign-build
+++ b/sign-build
@@ -81,7 +81,6 @@ mkdir -p $OUT_DIR
 
 # -o option replaces the test keys with the created ones
 python $BASEDIR/build/tools/releasetools/sign_target_files_apks \
-       -e FDroid.apk=$KEY_DIR/platform \
        -o \
        -d $KEY_DIR $TARGET_FILES \
        $OUT_DIR/signed-target_files.zip