diff --git a/package/Config.in b/package/Config.in
index 9c75fcc5e4..856048abd3 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -159,6 +159,7 @@ source "package/eeprog/Config.in"
 source "package/fconfig/Config.in"
 source "package/fis/Config.in"
 source "package/gadgetfs-test/Config.in"
+source "package/genext2fs/Config.in"
 source "package/genromfs/Config.in"
 source "package/gvfs/Config.in"
 source "package/hal/Config.in"
diff --git a/package/genext2fs/Config.in b/package/genext2fs/Config.in
new file mode 100644
index 0000000000..82992f8777
--- /dev/null
+++ b/package/genext2fs/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_GENEXT2FS
+       bool "genext2fs"
+       help
+         genext2fs generates an ext2 filesystem as a normal (non-root)
+	 user.  It does not require you to mount the image file to
+	 copy files on it, nor does it require that you become the
+	 superuser to make device nodes.
+
+	 http://genext2fs.sourceforge.net/
diff --git a/target/ext2/genext2fs-1.4-nosquash.patch b/package/genext2fs/genext2fs-1.4-nosquash.patch
similarity index 100%
rename from target/ext2/genext2fs-1.4-nosquash.patch
rename to package/genext2fs/genext2fs-1.4-nosquash.patch
diff --git a/target/ext2/genext2fs-1.4-remove_ugly_warnings.patch b/package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch
similarity index 100%
rename from target/ext2/genext2fs-1.4-remove_ugly_warnings.patch
rename to package/genext2fs/genext2fs-1.4-remove_ugly_warnings.patch
diff --git a/package/genext2fs/genext2fs.mk b/package/genext2fs/genext2fs.mk
new file mode 100644
index 0000000000..8c4981edbf
--- /dev/null
+++ b/package/genext2fs/genext2fs.mk
@@ -0,0 +1,12 @@
+#############################################################
+#
+# genext2fs
+#
+#############################################################
+
+GENEXT2FS_VERSION=1.4
+GENEXT2FS_SOURCE=genext2fs-$(GENEXT2FS_VERSION).tar.gz
+GENEXT2FS_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/genext2fs
+
+$(eval $(call AUTOTARGETS,package,genext2fs))
+$(eval $(call AUTOTARGETS,package,genext2fs,host))