diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java
index 500ad1729..44024f3ae 100644
--- a/F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java
+++ b/F-Droid/src/org/fdroid/fdroid/receiver/PackageAddedReceiver.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.receiver;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java
index 493e43893..9c972a540 100644
--- a/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java
+++ b/F-Droid/src/org/fdroid/fdroid/receiver/PackageReceiver.java
@@ -17,7 +17,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java
index 5c1a8f4db..540c39264 100644
--- a/F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java
+++ b/F-Droid/src/org/fdroid/fdroid/receiver/PackageRemovedReceiver.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.receiver;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/PackageUpgradedReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/PackageUpgradedReceiver.java
index faf1b4a36..c4dc7a472 100644
--- a/F-Droid/src/org/fdroid/fdroid/receiver/PackageUpgradedReceiver.java
+++ b/F-Droid/src/org/fdroid/fdroid/receiver/PackageUpgradedReceiver.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.receiver;
 
 import android.content.ContentValues;
 import android.content.Context;
diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/StartupReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/StartupReceiver.java
index 2d04342dd..126696d65 100644
--- a/F-Droid/src/org/fdroid/fdroid/receiver/StartupReceiver.java
+++ b/F-Droid/src/org/fdroid/fdroid/receiver/StartupReceiver.java
@@ -16,12 +16,14 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import org.fdroid.fdroid.UpdateService;
+
 public class StartupReceiver extends BroadcastReceiver {
 
     @Override
diff --git a/F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java b/F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
index 331114680..f0b5717cb 100644
--- a/F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
+++ b/F-Droid/src/org/fdroid/fdroid/receiver/WifiStateChangeReceiver.java
@@ -1,4 +1,4 @@
-package org.fdroid.fdroid;
+package org.fdroid.fdroid.receiver;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;