diff --git a/development/amaya/README b/development/amaya/README
new file mode 100644
index 0000000000..f21e1240bc
--- /dev/null
+++ b/development/amaya/README
@@ -0,0 +1,5 @@
+amaya (W3 Web Editor)
+
+Amaya is a Web editor, i.e. a tool used to create and update documents 
+directly on the Web. Browsing features are seamlessly integrated with 
+the editing and remote access features in a uniform environment.
diff --git a/development/amaya/amaya.SlackBuild b/development/amaya/amaya.SlackBuild
new file mode 100644
index 0000000000..319321fcb6
--- /dev/null
+++ b/development/amaya/amaya.SlackBuild
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+# Slackware build script for amaya
+
+# Written by Vincent Batts, http://hashbangbash.com/
+
+PRGNAM=amaya
+VERSION=${VERSION:-11.3.1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+fi
+
+set -e
+
+rm -rf $PKG
+mkdir -p $TMP $PKG $OUTPUT
+cd $TMP
+rm -rf Amaya${VERSION}
+tar xvf $CWD/$PRGNAM-sources-${VERSION}.tgz
+cd Amaya${VERSION}
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Apply a patch so wxWidgets builds with the newer gtk
+( cd wxWidgets ; cat $CWD/newgtk.patch | patch -p1 || exit 1 )
+
+mkdir -p Amaya/build
+cd Amaya/build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ../configure \
+    --prefix=/opt/ \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --docdir=/usr/doc/$PRGNAM-$VERSION \
+    --with-gl \
+    --with-wxsrcdir=../../wxWidgets/ \
+    --enable-system-raptor \
+    --build=$ARCH-slackware-linux
+  make wxwidgets || exit 1
+  make all || exit 1
+  make install DESTDIR=$PKG || exit 1
+cd ..
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# silly hack to link correctly
+rm -r $PKG/opt/bin/
+mkdir -p $PKG/usr/bin
+( cd $PKG/usr/bin/ ; ln -s ../../opt/Amaya/wx/bin/$PRGNAM )
+
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
+( cd $PKG/usr/share/pixmaps
+  ln -s ../../../opt/Amaya/resources/icons/misc/logo.png amaya.png
+)
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/development/amaya/amaya.desktop b/development/amaya/amaya.desktop
new file mode 100644
index 0000000000..ce3931bc1f
--- /dev/null
+++ b/development/amaya/amaya.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Exec=amaya
+Icon=amaya
+Type=Application
+Categories=Network;Development;WebDevelopment;
+Name=Amaya
+GenericName=Web Editor
+MimeType=text/html;text/css;text/x-javascript;text/x-python;text/x-perl;application/x-php;text/x-java;text/javascript;text/x-php;application/x-cgi;application/x-javascript;application/x-perl;application/x-python;application/xhtml+xml;text/mathml;text/x-csrc;text/x-chdr;text/x-dtd;text/x-sql;text/xml;
+X-KDE-StartupNotify=true
diff --git a/development/amaya/amaya.info b/development/amaya/amaya.info
new file mode 100644
index 0000000000..dcf13368eb
--- /dev/null
+++ b/development/amaya/amaya.info
@@ -0,0 +1,10 @@
+PRGNAM="amaya"
+VERSION="11.3.1"
+HOMEPAGE="http://www.w3.org/Amaya/"
+DOWNLOAD="http://www.w3.org/Amaya/Distribution/amaya-sources-11.3.1.tgz"
+MD5SUM="4a92b4e043fbd1add5b1e17fb7ed8755"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Vincent Batts"
+EMAIL="vbatts@hashbangbash.com"
+APPROVED="rworkman"
diff --git a/development/amaya/newgtk.patch b/development/amaya/newgtk.patch
new file mode 100644
index 0000000000..eb8e653c9e
--- /dev/null
+++ b/development/amaya/newgtk.patch
@@ -0,0 +1,16 @@
+--- wxGTK-2.8.10/src/gtk/gsockgtk.cpp	2009-03-06 09:18:08.000000000 -0300
++++ wxGTK-2.8.10_patched/src/gtk/gsockgtk.cpp	2010-03-27 08:32:57.000000000 -0300
+@@ -15,8 +15,13 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ 
++// newer versions of glib define its own GSocket but we unfortunately use this
++// name in our own (semi-)public header and so can't change it -- rename glib
++// one instead
++#define GSocket GlibGSocket
+ #include <gdk/gdk.h>
+ #include <glib.h>
++#undef GSocket
+ 
+ #include "wx/gsocket.h"
+ #include "wx/unix/gsockunx.h"
diff --git a/development/amaya/slack-desc b/development/amaya/slack-desc
new file mode 100644
index 0000000000..9f6810be08
--- /dev/null
+++ b/development/amaya/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler------------------------------------------------------|
+amaya: amaya (W3 Web Editor)
+amaya: 
+amaya: Amaya is a Web editor, i.e. a tool used to create and update 
+amaya: documents directly on the Web.  Browsing features are seamlessly 
+amaya: integrated with the editing and remote access features in a 
+amaya: uniform environment.
+amaya:
+amaya: Homepage: http://www.w3.org/Amaya/
+amaya:
+amaya:
+amaya: