diff --git a/gettext017/meta/relnotes b/gettext017/meta/relnotes
deleted file mode 100644
index bd83629..0000000
--- a/gettext017/meta/relnotes
+++ /dev/null
@@ -1,27 +0,0 @@
-PACKAGE DETAILS
----------------
-Name:	    %%PKGNAME%%
-Version:    %%SOURCE_AND_VER%%
-Vendor:	    %%VENDOR%%
-Packager:   %%PKGEDBY%%
-
-Source (sha1sum):
-%%SOURCE_SHA1SUM%%
-
-BUILD DETAILS
--------------
-Compiler:
-%%COMPILER%%
-
-Environment:
-%%ENVIRONMENT%%
-
-Configure:
-%%CONFIGURE%%
-
-KNOWN DEPENDENCIES
-------------------
-%%DEPENDENCIES%%
-
-ERRORS/MISCELLANEOUS
---------------------
diff --git a/gettext017/build.sh b/gettext018/build.sh
similarity index 71%
rename from gettext017/build.sh
rename to gettext018/build.sh
index a7dea22..23178bc 100755
--- a/gettext017/build.sh
+++ b/gettext018/build.sh
@@ -6,9 +6,9 @@
 ###########################################################
 # Check the following 4 variables before running the script
 topdir=gettext
-version=0.17
+version=0.18.3.1
 pkgver=1
-source[0]=$topdir-$version.tar.gz
+source[0]=ftp://ftp.sunet.se/pub/gnu/gettext/$topdir-$version.tar.gz
 # If there are no patches, simply comment this
 #patch[0]=
 
@@ -18,7 +18,9 @@ source[0]=$topdir-$version.tar.gz
 # Global settings
 export CPPFLAGS="-I$prefix/include"
 export LDFLAGS="-L$prefix/lib -R$prefix/lib"
-configure_args+=(--with-libiconv-prefix=$prefix --disable-java --disable-openmp)
+configure_args+=(--with-libiconv-prefix=$prefix --disable-java --disable-native-java --disable-openmp)
+
+gnu_link autopoint envsubst gettext gettext.sh gettextize msgattrib msgcat msgcmp msgcomm msgconv msgen msgexec msgfilter msgfmt msggrep msginit msgmerge msgunfmt msguniq ngettext recode-sr-latin xgettext
 
 reg prep
 prep()
@@ -43,6 +45,8 @@ install()
 {
     generic_install DESTDIR
     doc NEWS README COPYING
+    compat gettext 0.17 1 1
+    compat gettext 0.18.2 1 1
 }
 
 reg pack
diff --git a/gettext018/meta/ChangeLog b/gettext018/meta/ChangeLog
new file mode 100644
index 0000000..0dc20a8
--- /dev/null
+++ b/gettext018/meta/ChangeLog
@@ -0,0 +1,4 @@
+CHANGELOG
+---------
+* Thu Nov 07 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 0.18.3.1-1
+- Initial build
diff --git a/gettext017/meta/depend b/gettext018/meta/depend
similarity index 100%
rename from gettext017/meta/depend
rename to gettext018/meta/depend
diff --git a/gettext017/meta/pkgdef b/gettext018/meta/pkgdef
similarity index 72%
rename from gettext017/meta/pkgdef
rename to gettext018/meta/pkgdef
index 2ca7e8d..be4394c 100644
--- a/gettext017/meta/pkgdef
+++ b/gettext018/meta/pkgdef
@@ -7,15 +7,19 @@ pkgdesc="Tools to produce multi-lingual messages"
 pkgver="$pkgver"
 files(-,root,bin)
 default_docs
-$_bindir/envsubst
-$_bindir/ngettext
-$_bindir/gettext
-$_bindir/gettext.sh
+$_bindir/genvsubst
+$_bindir/gngettext
+$_bindir/ggettext
+$_bindir/ggettext.sh
+$_gnudir/envsubst
+$_gnudir/ngettext
+$_gnudir/gettext
+$_gnudir/gettext.sh
 $_libdir/libintl.so.8*
 $_libdir/libasprintf.so.0*
-$_mandir/man1/envsubst.1*
-$_mandir/man1/ngettext.1*
-$_mandir/man1/gettext.1*
+$_mandir/man1/genvsubst.1*
+$_mandir/man1/gngettext.1*
+$_mandir/man1/ggettext.1*
 $_sharedir/locale/*/LC_MESSAGES/gettext-runtime.mo
 $_sharedir/locale/locale.alias
 $_sharedir/doc/gettext/envsubst.1.html
@@ -30,22 +34,27 @@ pkgvendor="http://directory.fsf.org/gettext.html"
 pkgdesc="Tools to produce multi-lingual messages"
 pkgver="$pkgver"
 files(-,root,bin)
-$_bindir/autopoint
-$_bindir/gettextize
-$_bindir/msg*
-$_bindir/recode*
-$_bindir/xgettext
+$_bindir/gautopoint
+$_bindir/ggettextize
+$_bindir/gmsg*
+$_bindir/grecode*
+$_bindir/gxgettext
+$_gnudir/autopoint
+$_gnudir/gettextize
+$_gnudir/msg*
+$_gnudir/recode*
+$_gnudir/xgettext
 $_includedir
 $_libdir/*.a
 $_libdir/libgettext*.so*
 $_libdir/libasprintf.so
 $_libdir/libintl.so
 $_libdir/gettext
-$_mandir/man1/msg*.1*
-$_mandir/man1/gettextize.1*
-$_mandir/man1/autopoint.1*
-$_mandir/man1/recode*.1*
-$_mandir/man1/xgettext.1*
+$_mandir/man1/gmsg*.1*
+$_mandir/man1/ggettextize.1*
+$_mandir/man1/gautopoint.1*
+$_mandir/man1/grecode*.1*
+$_mandir/man1/gxgettext.1*
 $_mandir/man3
 $_sharedir/aclocal
 $_infodir