diff --git a/debian/control b/debian/control
index 5dfb6b1..3960ef2 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,8 @@ Vcs-Browser: https://github.com/imedias/lernstick-config
 Vcs-Git: https://github.com/imedias/lernstick-config.git
 
 Package: lernstick-config
-Architecture: all
-Depends: ${misc:Depends}, live-config (>= 5~), xmlstarlet, gfxboot, sqlite3, lernstick-archive-keyring, lernstick-xkb-data, sysfsutils
+Architecture: any
+Depends: ${misc:Depends}, live-config (>= 5~), xmlstarlet, gfxboot [amd64], sqlite3, lernstick-archive-keyring, lernstick-xkb-data, sysfsutils
 Provides: ${diverted-files}
 Conflicts: ${diverted-files}
 Description: Lernstick System Configuration
@@ -18,6 +18,15 @@ Description: Lernstick System Configuration
  configuration files for the Lernstick system. It uses config-package-dev to
  divert config files where necessary.
 
+Package: lernstick-arm-config
+Architecture: any
+Depends: ${misc:Depends}, lernstick-config
+Provides: ${diverted-files}
+Conflicts: ${diverted-files}
+Description: Lernstick System Configuration for ARM
+ This package contains the additional repository for ARM variant
+
+
 Package: lernstick-staging
 Architecture: all
 Depends: ${misc:Depends},
diff --git a/etc/apt/sources.list.d/lernstick-12.list b/etc/apt/sources.list.d/lernstick-12.list
index bf6c1cc..e48d8f8 100644
--- a/etc/apt/sources.list.d/lernstick-12.list
+++ b/etc/apt/sources.list.d/lernstick-12.list
@@ -1,5 +1,5 @@
 # Lernstick specific packages
-deb [arch=amd64] http://packages.lernstick.ch/lernstick lernstick-12 main contrib non-free
+deb  http://packages.lernstick.ch/lernstick lernstick-12 main contrib non-free
 deb-src http://packages.lernstick.ch/lernstick lernstick-12 main contrib non-free
 
 # Backports done by the Lernstick team of other packages
@@ -11,7 +11,7 @@ deb http://packages.lernstick.ch/lernstick lernstick-12-thirdparty main contrib
 deb-src http://packages.lernstick.ch/lernstick lernstick-12-thirdparty main contrib non-free
 
 # Staging packages (distribution set to "not automatic")
-deb [arch=amd64] http://packages.lernstick.ch/lernstick lernstick-12-staging main contrib non-free
+deb http://packages.lernstick.ch/lernstick lernstick-12-staging main contrib non-free
 deb-src http://packages.lernstick.ch/lernstick lernstick-12-staging main contrib non-free
 
 # Staging distribution for backports (set to "not automatic")