diff --git a/packages/base/any/fit/buildroot/APKG.yml b/packages/base/any/fit/buildroot/APKG.yml
new file mode 100644
index 00000000..0eb35982
--- /dev/null
+++ b/packages/base/any/fit/buildroot/APKG.yml
@@ -0,0 +1,19 @@
+prerequisites:
+  packages:
+    - onl-buildroot-initrd:$ARCH
+
+common:
+  arch: $ARCH
+  version: 1.0.0
+  copyright: Copyright 2013, 2014, 2015 Big Switch Networks
+  maintainer: support@bigswitch.com
+
+packages:
+  - name: onl-buildroot-fit
+    version: 1.0.0
+    summary: Open Network Linux FIT Buildroot Image for $ARCH
+
+    files:
+      builds/onl-buildroot-fit.itb : $$PKG_INSTALL/
+
+    changelog:  Change changes changes.,
diff --git a/packages/base/any/fit/buildroot/builds/Makefile b/packages/base/any/fit/buildroot/builds/Makefile
new file mode 100644
index 00000000..aa69ba5a
--- /dev/null
+++ b/packages/base/any/fit/buildroot/builds/Makefile
@@ -0,0 +1,13 @@
+ifndef ARCH
+$(error $$ARCH not set)
+endif
+
+.PHONY: onl-buildroot-fit.itb onl-buildroot-fit.its
+
+onl-buildroot-fit.itb:
+	$(ONL)/tools/flat-image-tree.py --initrd onl-buildroot-initrd:$(ARCH),onl-buildroot-initrd-$(ARCH).cpio.gz --arch $(ARCH) --add-platform all --itb $@
+
+onl-buildroot-fit.its:
+	$(ONL)/tools/flat-image-tree.py --initrd onl-buildroot-initrd:$(ARCH),onl-buildroot-initrd-$(ARCH).cpio.gz --arch $(ARCH) --add-platform all --its $@
+
+its: onl-buildroot-fit.its
diff --git a/packages/base/any/fit/loader/APKG.yml b/packages/base/any/fit/loader/APKG.yml
new file mode 100644
index 00000000..f50de736
--- /dev/null
+++ b/packages/base/any/fit/loader/APKG.yml
@@ -0,0 +1,20 @@
+prerequisites:
+  packages:
+    - onl-loader-initrd:$ARCH
+
+common:
+  arch: $ARCH
+  version: 1.0.0
+  copyright: Copyright 2013, 2014, 2015 Big Switch Networks
+  maintainer: support@bigswitch.com
+
+packages:
+  - name: onl-loader-fit
+    version: 1.0.0
+    summary: Open Network Linux FIT Loader Image for $ARCH
+
+    files:
+      builds/onl-loader-fit.itb : /etc/onl/upgrade/$ARCH/
+      builds/manifest.json      : /etc/onl/upgrade/$ARCH/
+
+    changelog:  Change changes changes.,
diff --git a/packages/base/any/fit/loader/builds/Makefile b/packages/base/any/fit/loader/builds/Makefile
new file mode 100644
index 00000000..f257e3b8
--- /dev/null
+++ b/packages/base/any/fit/loader/builds/Makefile
@@ -0,0 +1,14 @@
+ifndef ARCH
+$(error $$ARCH must be set)
+endif
+
+.PHONY: onl-loader-fit.itb onl-loader-fit.its
+
+onl-loader-fit.itb:
+	$(ONL)/tools/flat-image-tree.py --initrd onl-loader-initrd:$(ARCH),onl-loader-initrd-$(ARCH).cpio.gz --arch $(ARCH) --add-platform initrd --itb $@
+	$(ONLPM) --copy-file onl-loader-initrd:$(ARCH) manifest.json .
+
+onl-loader-fit.its:
+	$(ONL)/tools/flat-image-tree.py --initrd onl-loader-initrd:$(ARCH),onl-loader-initrd-$(ARCH).cpio.gz --arch $(ARCH) --add-platform initrd --its $@
+
+its: onl-loader-fit.its