diff --git a/Config.in.legacy b/Config.in.legacy
index c5b8223cf1..2bbf2ed867 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -104,6 +104,18 @@ comment "build, or run, in unpredictable ways.               "
 comment "----------------------------------------------------"
 endif
 
+###############################################################################
+comment "Legacy options removed in 2016.02"
+
+config BR2_PACKAGE_INFOZIP
+	bool "infozip option has been renamed to zip"
+	select BR2_LEGACY
+	select BR2_PACKAGE_ZIP
+	help
+	  Info-Zip's Zip package has been renamed from infozip to zip,
+	  to avoid ambiguities with Info-Zip's UnZip which has been added
+	  in the unzip package.
+
 ###############################################################################
 comment "Legacy options removed in 2015.11"
 
diff --git a/package/Config.in b/package/Config.in
index 988fe844b8..9e3494a6a6 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -51,11 +51,11 @@ menu "Compressors and decompressors"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/gzip/Config.in"
 endif
-	source "package/infozip/Config.in"
 	source "package/lz4/Config.in"
 	source "package/lzip/Config.in"
 	source "package/lzop/Config.in"
 	source "package/xz/Config.in"
+	source "package/zip/Config.in"
 endmenu
 
 menu "Debugging, profiling and benchmark"
diff --git a/package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch b/package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
similarity index 100%
rename from package/infozip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
rename to package/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch
diff --git a/package/infozip/0002-configure-Don-t-use-host-CPP.patch b/package/zip/0002-configure-Don-t-use-host-CPP.patch
similarity index 100%
rename from package/infozip/0002-configure-Don-t-use-host-CPP.patch
rename to package/zip/0002-configure-Don-t-use-host-CPP.patch
diff --git a/package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch b/package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch
similarity index 100%
rename from package/infozip/0003-Makefile-Use-CFLAGS-from-command-line.patch
rename to package/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch
diff --git a/package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch b/package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
similarity index 100%
rename from package/infozip/0004-configure-use-LDFLAGS-from-command-line.patch
rename to package/zip/0004-configure-use-LDFLAGS-from-command-line.patch
diff --git a/package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch b/package/zip/0005-unix-configure-remove-GID-UID-size-check.patch
similarity index 100%
rename from package/infozip/0005-unix-configure-remove-GID-UID-size-check.patch
rename to package/zip/0005-unix-configure-remove-GID-UID-size-check.patch
diff --git a/package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch b/package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
similarity index 100%
rename from package/infozip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
rename to package/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch
diff --git a/package/infozip/Config.in b/package/zip/Config.in
similarity index 88%
rename from package/infozip/Config.in
rename to package/zip/Config.in
index cfd7533e60..4b6360a456 100644
--- a/package/infozip/Config.in
+++ b/package/zip/Config.in
@@ -1,5 +1,5 @@
-config BR2_PACKAGE_INFOZIP
-	bool "infozip"
+config BR2_PACKAGE_ZIP
+	bool "zip"
 	help
 	  Zip is a compression and file packaging/archive utility.
 	  Although highly compatible both with PKWARE's PKZIP and
diff --git a/package/infozip/infozip.hash b/package/zip/zip.hash
similarity index 100%
rename from package/infozip/infozip.hash
rename to package/zip/zip.hash
diff --git a/package/infozip/infozip.mk b/package/zip/zip.mk
similarity index 66%
rename from package/infozip/infozip.mk
rename to package/zip/zip.mk
index e57f7e16d0..5338f88166 100644
--- a/package/infozip/infozip.mk
+++ b/package/zip/zip.mk
@@ -1,51 +1,51 @@
 ################################################################################
 #
-# infozip
+# zip
 #
 ################################################################################
 
-INFOZIP_VERSION = 30
-INFOZIP_SOURCE = zip$(INFOZIP_VERSION).tgz
-INFOZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
-INFOZIP_LICENSE = Info-ZIP
-INFOZIP_LICENSE_FILES = LICENSE
+ZIP_VERSION = 30
+ZIP_SOURCE = zip$(ZIP_VERSION).tgz
+ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src
+ZIP_LICENSE = Info-ZIP
+ZIP_LICENSE_FILES = LICENSE
 
 ifeq ($(BR2_PACKAGE_BZIP2),y)
-INFOZIP_DEPENDENCIES += bzip2
+ZIP_DEPENDENCIES += bzip2
 endif
 
 # Infozip's default CFLAGS.
-INFOZIP_CFLAGS = -I. -DUNIX
+ZIP_CFLAGS = -I. -DUNIX
 
 # Disable the support of 16-bit UIDs/GIDs, the test in unix/configure was
 # removed since it can't work for cross-compilation.
-INFOZIP_CFLAGS += -DUIDGID_NOT_16BIT
+ZIP_CFLAGS += -DUIDGID_NOT_16BIT
 
 # infozip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when
 # necessary, redefining it on the command line causes some warnings.
-INFOZIP_TARGET_CFLAGS = \
+ZIP_TARGET_CFLAGS = \
 	$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
 
-define INFOZIP_BUILD_CMDS
+define ZIP_BUILD_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \
-		CFLAGS="$(INFOZIP_TARGET_CFLAGS) $(INFOZIP_CFLAGS)" \
+		CFLAGS="$(ZIP_TARGET_CFLAGS) $(ZIP_CFLAGS)" \
 		AS="$(TARGET_CC) -c" \
 		-f unix/Makefile generic
 endef
 
-define INFOZIP_INSTALL_TARGET_CMDS
+define ZIP_INSTALL_TARGET_CMDS
 	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
 		prefix=$(TARGET_DIR)/usr
 endef
 
-define HOST_INFOZIP_BUILD_CMDS
+define HOST_ZIP_BUILD_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \
-		CFLAGS="$(HOST_CFLAGS) $(INFOZIP_CFLAGS)" \
+		CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \
 		AS="$(HOSTCC) -c" \
 		-f unix/Makefile generic
 endef
 
-define HOST_INFOZIP_INSTALL_CMDS
+define HOST_ZIP_INSTALL_CMDS
 	$(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \
 		prefix=$(HOST_DIR)/usr
 endef