diff --git a/games/javacpc/README b/games/javacpc/README
new file mode 100644
index 0000000000..d6bfeb9c38
--- /dev/null
+++ b/games/javacpc/README
@@ -0,0 +1 @@
+Amstrad CPC-Emulator in JAVA, based on JEMU.
diff --git a/games/javacpc/doinst.sh b/games/javacpc/doinst.sh
new file mode 100644
index 0000000000..5fb28930db
--- /dev/null
+++ b/games/javacpc/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
diff --git a/games/javacpc/javacpc.SlackBuild b/games/javacpc/javacpc.SlackBuild
new file mode 100644
index 0000000000..c218acdf57
--- /dev/null
+++ b/games/javacpc/javacpc.SlackBuild
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# Slackware build script for javacpc
+
+# Copyright 2014 Dimitris Zlatanidis Greece-Orestiada
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+PRGNAM=javacpc
+SRCNAM=JavaCPC-Desktop
+VERSION=${VERSION:-2.3}
+BUILD=${BUILD:-1}
+TAG=${TAG:-_SBo}
+
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) 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 $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz || tar xvf $CWD/$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+# copy resources and libraries
+DATA="system lib alpha1.dsk JavaCPC_Easteregg.zip"
+mkdir -p $PKG/usr/share/$PRGNAM
+for i in $DATA; do
+    cp -rf $i $PKG/usr/share/$PRGNAM
+done
+
+# install library
+install -D -m0644 libjinput-linux${LIBDIRSUFFIX}.so \
+        $PKG/usr/share/$PRGNAM/libjinput-linux${LIBDIRSUFFIX}.so
+
+# install executable
+install -D -m0755 *.jar $PKG/usr/share/$PRGNAM
+
+# remove unused
+REMOVE="*.exe *.dll lib/sunos lib/windows"
+for i in $REMOVE; do
+    rm -rf $PKG/usr/share/$PRGNAM/$i
+done
+
+# install launcher
+mkdir -p $PKG/usr/bin
+install -D -m0755 $CWD/$PRGNAM.sh $PKG/usr/bin/$PRGNAM
+
+mkdir -p $PKG/usr/share/applications
+install -D -m644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
+
+mkdir -p $PKG/usr/share/pixmaps/
+install -D -m644 $CWD/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.md $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
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/games/javacpc/javacpc.desktop b/games/javacpc/javacpc.desktop
new file mode 100644
index 0000000000..d700c19638
--- /dev/null
+++ b/games/javacpc/javacpc.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name= JavaCPC
+Comment= Amstrad CPC emulator in Java, based on JEMU
+Exec=javacpc
+Icon=javacpc
+Terminal=false
+Type=Application
+Categories=Application;Game;Emulator;
+GenericName=Game
diff --git a/games/javacpc/javacpc.info b/games/javacpc/javacpc.info
new file mode 100644
index 0000000000..adbe514c0f
--- /dev/null
+++ b/games/javacpc/javacpc.info
@@ -0,0 +1,10 @@
+PRGNAM="javacpc"
+VERSION="2.3"
+HOMEPAGE="http://cpc-live.com"
+DOWNLOAD="https://github.com/dslackw/JavaCPC-Desktop/archive/2.3.tar.gz"
+MD5SUM="8b226f45dfaa417bc6741205426de10f"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+REQUIRES="jdk"
+MAINTAINER="Dimitris Zlatanidis"
+EMAIL="d.zlatanidis@gmail.com"
diff --git a/games/javacpc/javacpc.png b/games/javacpc/javacpc.png
new file mode 100644
index 0000000000..fce3220278
Binary files /dev/null and b/games/javacpc/javacpc.png differ
diff --git a/games/javacpc/javacpc.sh b/games/javacpc/javacpc.sh
new file mode 100644
index 0000000000..ef6271ce53
--- /dev/null
+++ b/games/javacpc/javacpc.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /usr/share/javacpc
+java -jar JavaCPC.jar
diff --git a/games/javacpc/slack-desc b/games/javacpc/slack-desc
new file mode 100644
index 0000000000..aafafb2a76
--- /dev/null
+++ b/games/javacpc/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 ':' except on otherwise blank lines.
+
+       |-----handy-ruler------------------------------------------------------|
+javacpc: javacpc (Amstrad CPC-Emulator)
+javacpc:
+javacpc: Amstrad CPC-Emulator in JAVA, based on JEMU by R. Wilson.
+javacpc:
+javacpc: Homepage: http://cpc-live.com
+javacpc:
+javacpc:
+javacpc:
+javacpc:
+javacpc:
+javacpc: