diff --git a/srcpkgs/librecode b/srcpkgs/librecode
new file mode 120000
index 00000000000..a9151d0f3dd
--- /dev/null
+++ b/srcpkgs/librecode
@@ -0,0 +1 @@
+recode
\ No newline at end of file
diff --git a/srcpkgs/recode-devel b/srcpkgs/recode-devel
new file mode 120000
index 00000000000..a9151d0f3dd
--- /dev/null
+++ b/srcpkgs/recode-devel
@@ -0,0 +1 @@
+recode
\ No newline at end of file
diff --git a/srcpkgs/recode/depends b/srcpkgs/recode/depends
new file mode 100644
index 00000000000..cc903616eb8
--- /dev/null
+++ b/srcpkgs/recode/depends
@@ -0,0 +1,2 @@
+abi_depends=">=3.6"
+api_depends="${abi_depends}"
diff --git a/srcpkgs/recode/librecode.template b/srcpkgs/recode/librecode.template
new file mode 100644
index 00000000000..fb09e6121b8
--- /dev/null
+++ b/srcpkgs/recode/librecode.template
@@ -0,0 +1,14 @@
+# Template file for 'librecode'.
+#
+short_desc="${short_desc} - shared library"
+long_desc="${long_desc}
+
+ This package contains the shared library."
+
+Add_dependency run glibc
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.so* ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/recode/patches/recode-3.6-as-if.patch b/srcpkgs/recode/patches/recode-3.6-as-if.patch
new file mode 100644
index 00000000000..c7bcc27c875
--- /dev/null
+++ b/srcpkgs/recode/patches/recode-3.6-as-if.patch
@@ -0,0 +1,19 @@
+http://bugs.gentoo.org/283029
+
+--- a/m4/flex.m4
++++ b/m4/flex.m4
+@@ -8,11 +8,11 @@ dnl ad_AC_PROG_FLEX
+ dnl Look for flex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+ AC_DEFUN(ad_AC_PROG_FLEX,
+ [AC_CHECK_PROGS(LEX, flex, missing)
+-if test "$LEX" = missing; then
++AS_IF([test "$LEX" = missing], [dnl
+   LEX="\$(top_srcdir)/$ac_aux_dir/missing flex"
+   LEX_OUTPUT_ROOT=lex.yy
+   AC_SUBST(LEX_OUTPUT_ROOT)dnl
+-else
++], [:
+   AC_PROG_LEX
+   AC_DECL_YYTEXT
+-fi])
++])])
diff --git a/srcpkgs/recode/patches/recode-3.6-gettextfix.diff b/srcpkgs/recode/patches/recode-3.6-gettextfix.diff
new file mode 100644
index 00000000000..3b7eb8ba20e
--- /dev/null
+++ b/srcpkgs/recode/patches/recode-3.6-gettextfix.diff
@@ -0,0 +1,23 @@
+http://bugs.gentoo.org/239372
+
+patch by Dmitry Karasik
+
+--- recode-3.6/m4/gettext.m4
++++ recode-3.6/m4/gettext.m4
+@@ -109,12 +109,12 @@
+     else
+       ac_items="$LINGUAS"
+       for ac_item in $ac_items; do
+-	case "$ALL_LINGUAS" in
+-	  *$ac_item*)
++        for supported_item in $ALL_LINGUAS; do
++          if test "$ac_item" = "$supported_item"; then
+ 	    ac_print="$ac_print $ac_item"
+ 	    MOFILES="$MOFILES $ac_item.mo"
+-	    ;;
+-	esac
++          fi
++        done
+       done
+     fi
+     AC_SUBST(MOFILES)
diff --git a/srcpkgs/recode/patches/recode_3.6-17.diff.gz b/srcpkgs/recode/patches/recode_3.6-17.diff.gz
new file mode 100644
index 00000000000..e6297bd2518
Binary files /dev/null and b/srcpkgs/recode/patches/recode_3.6-17.diff.gz differ
diff --git a/srcpkgs/recode/recode-devel.template b/srcpkgs/recode/recode-devel.template
new file mode 100644
index 00000000000..340fdbdd127
--- /dev/null
+++ b/srcpkgs/recode/recode-devel.template
@@ -0,0 +1,17 @@
+# Template file for 'recode-devel'.
+#
+short_desc="${short_desc} - development files"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run glib-devel
+Add_dependency run librecode
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/*.*a ${DESTDIR}/usr/lib
+}
diff --git a/srcpkgs/recode/template b/srcpkgs/recode/template
new file mode 100644
index 00000000000..e06cbb3dd43
--- /dev/null
+++ b/srcpkgs/recode/template
@@ -0,0 +1,27 @@
+# Template file for 'recode'
+pkgname=recode
+version=3.6
+patch_args="-Np1"
+distfiles="${DEBIAN_SITE}/main/r/${pkgname}/${pkgname}_${version}.orig.tar.gz"
+build_style=gnu_configure
+configure_args="--without-included-gettext"
+short_desc="Character set conversion utility"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=e3e6a4f3f8e5c6052ab70155990c074d87aa0b614fc1be31d194750d1d962fcf
+long_desc="
+ Free recode converts files between character sets and usages. When exact
+ transliterations are not possible, it may get rid of the offending
+ characters or fall back on approximations. This program recognizes or
+ produces nearly 300 different character sets and is able to transliterate
+ files between almost any pair. Most RFC 1345 character sets, and all
+ libiconv character sets, are supported."
+
+subpackages="librecode $pkgname-devel"
+Add_dependency run glibc
+Add_dependency run librecode
+Add_dependency build texinfo
+
+pre_configure()
+{
+	cd ${wrksrc} && rm -f acinclude.m4 && autoreconf -fi && libtoolize
+}
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index 169f8634a60..e08b31f04c0 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -715,3 +715,4 @@ libmms.so			libmms			libmms-devel
 libsmbclient.so			libsmbclient		samba-devel
 libwbclient.so			libsmbclient		samba-devel
 libjasper.so			libjasper		jasper-devel
+librecode.so			librecode		recode-devel