diff --git a/debian/android-sdk-libsparse-utils.install b/debian/android-sdk-libsparse-utils.install
new file mode 100755
index 00000000..4052e8f5
--- /dev/null
+++ b/debian/android-sdk-libsparse-utils.install
@@ -0,0 +1,5 @@
+#!/usr/bin/dh-exec
+
+libsparse/simg_dump.py => usr/bin/simg_dump
+libsparse/simg2simg	usr/bin
+libsparse/img2simg	usr/bin
diff --git a/debian/img2simg.lintian-overrides b/debian/android-sdk-libsparse-utils.lintian-overrides
similarity index 100%
rename from debian/img2simg.lintian-overrides
rename to debian/android-sdk-libsparse-utils.lintian-overrides
diff --git a/debian/control b/debian/control
index a376dc2a..59e58098 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends: android-libunwind-dev (>= 7.0.0+r1~) [amd64 i386 armel armhf arm6
                bash-completion,
                debhelper (>= 10),
                dh-exec,
+	       python,
                dpkg-dev (>= 1.17.14),
                libsafe-iop-dev [amd64 i386 armel armhf arm64 mips mipsel mips64el],
                libssl-dev [amd64 i386 armel armhf arm64 mips mipsel mips64el],
@@ -22,6 +23,23 @@ Homepage: https://android.googlesource.com/platform/system/core
 Vcs-Git: https://salsa.debian.org/android-tools-team/android-platform-system-core.git
 Vcs-Browser: https://salsa.debian.org/android-tools-team/android-platform-system-core
 
+Package: android-tools-fsutils
+Depends: android-sdk-libsparse-utils, android-sdk-ext4-utils, simg2img, ${shlibs:Depends}, ${misc:Depends}
+Architecture: all
+Priority: optional
+Section: oldlibs
+Description: Transitional package
+ This is a transitional package. It can safely be removed.
+
+
+Package: android-sdk-libsparse-utils
+Architecture: amd64 i386
+Depends: python,${shlibs:Depends}, ${misc:Depends}
+Breaks: android-tools-fsutils (<< 5.1.1.r38-1.1~)
+Replaces: android-tools-fsutils (<< 5.1.1.r38-1.1~)
+Description: Android sparse image creation tool
+ Command line tools to create sparse images for usage with Android devices.
+
 Package: android-liblog
 Section: libs
 Architecture: amd64 i386 armel armhf arm64 mips mipsel mips64el
@@ -253,19 +271,12 @@ Description: Android fastboot tool
 Package: simg2img
 Architecture: amd64 i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: android-tools-fsutils (<< 6.0~)
-Replaces: android-tools-fsutils (<< 6.0~)
+Breaks: android-tools-fsutils (<< 5.1.1.r38-1.1~)
+Replaces: android-tools-fsutils (<< 5.1.1.r38-1.1~)
 Description: Android sparse image conversion tool
  A command line tool to convert sparse images to raw images, which can then
  be manipulated with the standard tools.
 
-Package: img2simg
-Architecture: amd64 i386
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Breaks: android-tools-fsutils (<< 6.0~)
-Replaces: android-tools-fsutils (<< 6.0~)
-Description: Android sparse image creation tool
- A command line tool to create sparse images for usage with Android devices.
 
 Package: append2simg
 Architecture: amd64 i386
diff --git a/debian/img2simg.docs b/debian/img2simg.docs
deleted file mode 100644
index 6d5ee1d0..00000000
--- a/debian/img2simg.docs
+++ /dev/null
@@ -1 +0,0 @@
-NOTICE
diff --git a/debian/img2simg.install b/debian/img2simg.install
deleted file mode 100644
index daedbaf0..00000000
--- a/debian/img2simg.install
+++ /dev/null
@@ -1 +0,0 @@
-libsparse/img2simg	usr/bin
diff --git a/debian/rules b/debian/rules
index 62c679af..fef588b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -fPIC
 STAGE1_COMPONENTS = adb \
                     simg2img \
                     img2simg \
+		    simg2simg \
                     append2simg \
                     libadb.so \
                     libbacktrace.so \
@@ -64,13 +65,16 @@ fastboot: debian/fastboot.mk libziparchive.so libsparse.so libbase.so libcutils.
 simg2img: debian/simg2img.mk libsparse.so
 	make -f $<
 
+simg2simg: debian/simg2simg.mk libsparse.so
+	make -f $<
+
 img2simg: debian/img2simg.mk libsparse.so
 	make -f $<
 
 append2simg: debian/append2simg.mk libsparse.so
 	make -f $<
 
-.PHONY: adb fastboot simg2img img2simg append2simg
+.PHONY: adb fastboot simg2img img2simg simg2simg append2simg
 
 %:
 	dh $@ --with bash-completion
diff --git a/debian/simg2simg.mk b/debian/simg2simg.mk
new file mode 100644
index 00000000..6a5fa18e
--- /dev/null
+++ b/debian/simg2simg.mk
@@ -0,0 +1,13 @@
+NAME = simg2simg
+SOURCES = simg2simg.c sparse_crc32.c
+SOURCES := $(foreach source, $(SOURCES), libsparse/$(source))
+CFLAGS += -Ilibsparse/include -fpermissive
+LDFLAGS += -Wl,-rpath=/usr/lib/$(DEB_HOST_MULTIARCH)/android \
+           -Wl,-rpath-link=. \
+           -lz -L. -lsparse
+
+build: $(SOURCES)
+	$(CXX) $^ -o libsparse/$(NAME) $(CFLAGS) $(LDFLAGS)
+
+clean:
+	$(RM) libsparse/$(NAME)