diff --git a/tools/build-deb.sh b/tools/build-deb.sh
index 6a8e53f6..c09124f1 100755
--- a/tools/build-deb.sh
+++ b/tools/build-deb.sh
@@ -48,6 +48,7 @@ PKGPATH="../packages/deb"
 rm -fr $PKGPATH
 mkdir -p $PKGPATH/amd64/DEBIAN/
 mkdir -p $PKGPATH/i386/DEBIAN/
+mkdir -p $PKGPATH/arm/DEBIAN/
 
 getControl "amd64" "$version" > $PKGPATH/amd64/DEBIAN/control
 tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro"
@@ -59,10 +60,17 @@ tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro"
 mkdir -p $PKGPATH/i386/usr/local/bin/
 mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/"
 
+getControl "arm" "$version" > $PKGPATH/arm/DEBIAN/control
+tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro"
+mkdir -p $PKGPATH/arm/usr/local/bin
+mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin"
+
 rm -rf "micro-$version"
 
 installFiles $PKGPATH "amd64"
 installFiles $PKGPATH "i386"
+installFiles $PKGPATH "arm"
 
 dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb"
 dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb"
+dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb"
diff --git a/tools/build-rpm.sh b/tools/build-rpm.sh
index edbb2ddd..5eeb596c 100755
--- a/tools/build-rpm.sh
+++ b/tools/build-rpm.sh
@@ -3,15 +3,22 @@
 #Based on the build-deb.sh but for rpm instead
 
 function BuildRPMSpec() {
-dategenerated = date +%F_%H:%M
+dategenerated=$(date +%F_%H:%M)
 echo Name: micro
-echo Version: $2
+echo Version: $(echo $2 | tr "-" "." )
 echo Release: 1
 echo "Summary: A feature-rich terminal text editor"
 echo URL: https://micro-editor.github.io
 echo "Packager: Zachary Yedidia \<zyedidia@gmail.com\>"
 echo License: MIT
-echo ExclusiveArch: $1
+if [ $1 == "amd64" ]
+then
+echo BuildArch: "x86_64"
+fi
+if [ $1 == "i386" ]
+then
+echo BuildArch: "x86"
+fi
 echo "Group: Applications/Editors"
 echo "%description"
 echo "A modern and intuitive terminal-based text editor."
@@ -39,8 +46,8 @@ echo "/usr/share/man/man1/micro.1.gz"
 echo "/usr/share/applications/micro.desktop"
 echo "/usr/share/icons/micro.svg"
 echo "%changelog"
-echo "Version: $1-$2"
-echo "Auto generated on $dategenerated by $USER@$HOSTNAME"
+echo "*Version: $1-$2"
+echo "*Auto generated on $dategenerated by $USER@$HOSTNAME"
 }
 
 function installFiles() {
@@ -74,20 +81,31 @@ PKGPATH="../packages/rpm"
 rm -fr $PKGPATH
 mkdir -p $PKGPATH/amd64/
 mkdir -p $PKGPATH/i386/
+mkdir -p $PKGPATH/arm/
 
-buildRPMSpec "amd64" "$version" > "$PKGPATH/amd64/micro-$version-amd64.spec"
-buildRPMSpec "amd64" "$version"
-tar -xzf "../binaries/micro-$version-linux.tar.gz" "micro-$version/micro"
+BuildRPMSpec "amd64" "$version" > "$PKGPATH/amd64/micro-$version-amd64.spec"
+#BuildRPMSpec "amd64" "$version"
+tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro"
+mkdir -p $PKGPATH/amd64/usr/local/bin/
 mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin"
 
-buildRPMSpec "i386" "$version" > "$PKGPATH/i386/micro-$version-i386.spec"
-buildRPMSpec "i386" "$version"
+BuildRPMSpec "i386" "$version" > "$PKGPATH/i386/micro-$version-i386.spec"
+#BuildRPMSpec "i386" "$version"
 tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro"
+mkdir -p $PKGPATH/i386/usr/local/bin/
 mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/"
 
+BuildRPMSpec "arm" "$version" > "$PKGPATH/arm/micro-$version-arm.spec"
+tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro"
+mkdir -p $PKGPATH/arm/usr/local/bin
+mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin"
+
 rm -rf "micro-$version"
+
 installFiles $PKGPATH "amd64"
 installFiles $PKGPATH "i386"
+installFiles $PKGPATH "arm"
 
 rpmbuild -bb --buildroot $PKGPATH/amd64 $PKGPATH/amd64/micro-$version-amd64.spec
 rpmbuild -bb --buildroot $PKGPATH/i386 $PKGPATH/i386/micro-$version-i386.spec
+rpmbuild -bb --buildroot $PKGPATH/arm $PKGPATH/arm/micro/$version-arm.spec