diff --git a/android-tools.spec b/android-tools.spec
index be0df4a..09be595 100644
--- a/android-tools.spec
+++ b/android-tools.spec
@@ -76,7 +76,7 @@ PKGVER=%{git_commit} sh -xe build.sh
 %install
 install -d -m 0755 ${RPM_BUILD_ROOT}%{_bindir}
 install -d -m 0775 ${RPM_BUILD_ROOT}%{_sharedstatedir}/adb
-install -m 0755 -t ${RPM_BUILD_ROOT}%{_bindir} adb/adb fastboot/fastboot 
+install -m 0755 -t ${RPM_BUILD_ROOT}%{_bindir} adb/adb fastboot/fastboot libsparse/simg2img libsparse/img2simg
 install -p -D -m 0644 %{SOURCE6} \
     %{buildroot}%{_unitdir}/adb.service
 
@@ -95,6 +95,8 @@ install -p -D -m 0644 %{SOURCE6} \
 %attr(0755,root,root) %dir %{_sharedstatedir}/adb
 #ASL2.0
 %{_bindir}/adb
+%{_bindir}/simg2img
+%{_bindir}/img2simg
 #ASL2.0 and BSD.
 %{_bindir}/fastboot
 
@@ -102,6 +104,7 @@ install -p -D -m 0644 %{SOURCE6} \
 %changelog
 * Sun Apr 08 2016 Bastien Nocera <hadess@hadess.net> - 20160327git3761365735de-2
 - Add missing BuildRequires for Ruby script to run
+- Compile and build img2simg and simg2img
 
 * Sun Mar 27 2016 Ivan Afonichev <ivan.afonichev@gmail.com> - 20160327git3761365735de-1
 - Update to upstream git commit 3761365735de
diff --git a/generate_build.rb b/generate_build.rb
index 18a8674..e9f81c0 100644
--- a/generate_build.rb
+++ b/generate_build.rb
@@ -178,3 +178,14 @@ libext4 = compile(expand('../extras/ext4_utils', ext4files), '-Ilibsparse/includ
 
 link('fastboot/fastboot', libsparse + libzip + liblog + libutil + libcutils + libbase + libext4 + libfastboot + libadbsh + libadbd, '-lpthread -lselinux -lz -lcrypto -lutil')
 
+simg2imgfiles = %w(
+  simg2img.c
+)
+libsimg2img = compile(expand('libsparse', simg2imgfiles), '-Iinclude -Ilibsparse/include')
+link('libsparse/simg2img', libsparse + libsimg2img, '-lz')
+
+img2simgfiles = %w(
+  img2simg.c
+)
+libimg2simg = compile(expand('libsparse', img2simgfiles), '-Iinclude -Ilibsparse/include')
+link('libsparse/img2simg', libsparse + libimg2simg, '-lz')